diff --git a/src/js/gui.js b/src/js/gui.js
index b29d2cc2..c285a9dd 100644
--- a/src/js/gui.js
+++ b/src/js/gui.js
@@ -323,7 +323,9 @@ GUI_control.prototype.content_ready = function (callback) {
 
 GUI_control.prototype.selectDefaultTabWhenConnected = function() {
     chrome.storage.local.get(['rememberLastTab', 'lastTab'], function (result) {
-        if (!(result.rememberLastTab && !!result.lastTab)) {
+        if (!(result.rememberLastTab 
+                && !!result.lastTab 
+                && result.lastTab.substring(4) != "cli")) {
             $('#tabs ul.mode-connected .tab_setup a').click();
             return;
         }