diff --git a/src/js/gui.js b/src/js/gui.js
index 0d1183f4..00dd02b1 100644
--- a/src/js/gui.js
+++ b/src/js/gui.js
@@ -373,13 +373,11 @@ GuiControl.prototype.content_ready = function (callback) {
 
 GuiControl.prototype.selectDefaultTabWhenConnected = function() {
     ConfigStorage.get(['rememberLastTab', 'lastTab'], function (result) {
-        if (!(result.rememberLastTab
-                && !!result.lastTab
-                && result.lastTab.substring(4) !== "cli")) {
+        if (result.rememberLastTab && result.lastTab) {
+            $(`#tabs ul.mode-connected .${result.lastTab} a`).click();
+        } else {
             $('#tabs ul.mode-connected .tab_setup a').click();
-            return;
         }
-        $(`#tabs ul.mode-connected .${result.lastTab} a`).click();
     });
 };
 
diff --git a/src/js/main.js b/src/js/main.js
index d11678a2..f39b04cb 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -219,9 +219,15 @@ function startProcess() {
     // Tabs
     $("#tabs ul.mode-connected li").click(function() {
         // store the first class of the current tab (omit things like ".active")
-        ConfigStorage.set(
-            {lastTab: $(this).attr("class").split(' ')[0]}
-        );
+        const tabName = $(this).attr("class").split(' ')[0];
+
+        const tabNameWithoutPrefix = tabName.substring(4);
+        if (tabNameWithoutPrefix !== "cli") {
+            // Don't store 'cli' otherwise you can never connect to another tab.
+            ConfigStorage.set(
+                {lastTab: tabName},
+            );
+        }
     });
 
     if (GUI.isCordova()) {