diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 786c6b46..3b3f4c35 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -168,7 +168,7 @@ var SettingsPage = React.createClass({
                      onChange={ this.handleChangeHideMenuBar } />);
     }
     if (process.platform === 'darwin' || process.platform === 'linux') {
-      options.push(<Input key="inputShowTrayIcon" id="inputShowTrayIcon" ref="showTrayIcon" type="checkbox" label="Show icon on menu bar (Need to restart the application)" checked={ this.state.showTrayIcon }
+      options.push(<Input key="inputShowTrayIcon" id="inputShowTrayIcon" ref="showTrayIcon" type="checkbox" label={ process.platform === 'darwin' ? "Show icon on menu bar (need to restart the application)" : "Show icon in notification area (need to restart the application)" } checked={ this.state.showTrayIcon }
                      onChange={ this.handleChangeShowTrayIcon } />);
     }
     if (process.platform === 'linux') {
diff --git a/src/main.js b/src/main.js
index 82d32f16..59c8005e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -444,7 +444,7 @@ app.on('ready', function() {
     if (shouldShowTrayIcon()) {
       const tray_menu = require('./main/menus/tray').createMenu(mainWindow, config);
       trayIcon.setContextMenu(tray_menu);
-      if (process.platform === 'darwin') {
+      if (process.platform === 'darwin' || process.platform === 'linux') {
         // store the information, if the tray was initialized, for checking in the settings, if the application
         // was restarted after setting "Show icon on menu bar"
         if (trayIcon)