diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index c4892b73..f57f5b3c 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -168,7 +168,9 @@ void MainWindow::open()
 {
     createTrayIcon();
 
-    if (!autoHide()) {
+    if (appConfig().getAutoHide()) {
+        hide();
+    } else {
         showNormal();
     }
 
@@ -470,17 +472,6 @@ void MainWindow::checkFingerprint(const QString& line)
     }
 }
 
-bool MainWindow::autoHide()
-{
-    if ((appConfig().processMode() == Desktop) &&
-        appConfig().getAutoHide()) {
-        hide();
-        return true;
-    }
-
-    return false;
-}
-
 QString MainWindow::getTimeStamp()
 {
     QDateTime current = QDateTime::currentDateTime();
diff --git a/src/gui/src/MainWindow.h b/src/gui/src/MainWindow.h
index 92de8c78..ae4cb24c 100644
--- a/src/gui/src/MainWindow.h
+++ b/src/gui/src/MainWindow.h
@@ -175,7 +175,6 @@ public slots:
         QString getProfileRootForArg();
         void checkConnected(const QString& line);
         void checkFingerprint(const QString& line);
-        bool autoHide();
         QString getTimeStamp();
         void restartBarrier();
         void proofreadInfo();
diff --git a/src/gui/src/SettingsDialogBase.ui b/src/gui/src/SettingsDialogBase.ui
index bd8c54ed..432ec0db 100644
--- a/src/gui/src/SettingsDialogBase.ui
+++ b/src/gui/src/SettingsDialogBase.ui
@@ -184,7 +184,7 @@
       <item row="2" column="0">
        <widget class="QCheckBox" name="m_pCheckBoxEnableCrypto">
         <property name="text">
-         <string>Use Enable &amp;SSL</string>
+         <string>Enable &amp;SSL</string>
         </property>
        </widget>
       </item>