diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5cc6d1bbb..4872bf8d2 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -715,7 +715,6 @@ void MainWindow::toggleVisibility(QSystemTrayIcon::ActivationReason e) {
       hide();
     }
   }
-  actionToggleVisibility->setText(isVisible() ? tr("Hide") : tr("Show"));
 }
 
 // Display About Dialog
@@ -1193,12 +1192,17 @@ void MainWindow::updateAltSpeedsBtn(bool alternative) {
   actionUse_alternative_speed_limits->setChecked(alternative);
 }
 
+void MainWindow::updateTrayIconMenu()
+{
+  actionToggleVisibility->setText(isVisible() ? tr("Hide") : tr("Show"));
+}
+
 QMenu* MainWindow::getTrayIconMenu() {
   if (myTrayIconMenu)
     return myTrayIconMenu;
   // Tray icon Menu
   myTrayIconMenu = new QMenu(this);
-  actionToggleVisibility->setText(isVisible() ? tr("Hide") : tr("Show"));
+  connect(myTrayIconMenu, SIGNAL(aboutToShow()), SLOT(updateTrayIconMenu()));
   myTrayIconMenu->addAction(actionToggleVisibility);
   myTrayIconMenu->addSeparator();
   myTrayIconMenu->addAction(actionOpen);
diff --git a/src/mainwindow.h b/src/mainwindow.h
index fabbb1496..8bc106f99 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -111,6 +111,7 @@ protected slots:
   void notifyOfUpdate(QString);
   void showConnectionSettings();
   void minimizeWindow();
+  void updateTrayIconMenu();
   // Keyboard shortcuts
   void createKeyboardShortcuts();
   void displayTransferTab() const;