diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index a5efcd97..1b7cddd3 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -151,10 +151,11 @@ var SettingsPage = React.createClass({
         label: 'Never',
         state: 0
       },
+      /* ToDo: Idle isn't implemented yet
       {
         label: 'Only when idle (after 10 seconds)',
         state: 1
-      },
+      },*/
       {
         label: 'Always',
         state: 2
@@ -165,19 +166,18 @@ var SettingsPage = React.createClass({
     var notificationElements = notificationSettings.map(function(item) {
       var boundClick = that.handleFlashWindowSetting.bind(that, item);
       return (
-          <Input key={ "flashWindow"  + item.state } name="handleFlashWindow" ref={ "flashWindow"  + item.state } type="radio"
-                 label={ item.label } value={ item.state } onChange={ boundClick }
-                 checked={ that.state.notifications.flashWindow == item.state ? "checked" : "" }/>
-      );
+        <Input key={ "flashWindow" + item.state } name="handleFlashWindow" ref={ "flashWindow" + item.state } type="radio" label={ item.label } value={ item.state } onChange={ boundClick }
+          checked={ that.state.notifications.flashWindow == item.state ? "checked" : "" } />
+        );
     });
 
     var notifications = (
-        <Row>
-          <Col md={ 12 }>
-            <h2>Notifications</h2>
-            { notificationElements }
-          </Col>
-        </Row>
+    <Row>
+      <Col md={ 12 }>
+      <h2>Notifications</h2> Configure, that the taskicon in the taskbar blinks when you were mentioned.
+      { notificationElements }
+      </Col>
+    </Row>
     )
 
     return (
diff --git a/src/main.js b/src/main.js
index ef3a7792..703a746a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -190,6 +190,7 @@ app.on('ready', function() {
         content: arg.options.body
       });
 
+      /* Todo: add idle here */
       if (config.notifications.flashWindow == 2) {
         mainWindow.flashFrame(true);
       }
@@ -213,8 +214,8 @@ app.on('ready', function() {
       }
       else {
         trayIcon.setImage(trayImages.normal);
-        mainWindow.flashFrame(false);
         trayIcon.setToolTip(app.getName());
+        mainWindow.flashFrame(false);
       }
     });
   }