diff --git a/src/js/main.js b/src/js/main.js
index 979724ee..b4c66ad1 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -86,19 +86,19 @@ function startProcess() {
                 return;
             }
 
+            $("#tabs ul.mode-connected li").click(function() {
+                // store the first class of the current tab (omit things like ".active")
+                chrome.storage.local.set({
+                    lastTab: $(this).attr("class").split(' ')[0]
+                });
+            });
+        
             GUI.tab_switch_in_progress = true;
 
             GUI.tab_switch_cleanup(function () {
                 // disable previously active tab highlight
                 $('li', ui_tabs).removeClass('active');
                 
-                // store last active tab only when connected
-                if (GUI.connected_to) {
-                    chrome.storage.local.set({
-                        lastTab: $(self).parent().attr("class")
-                    });
-                }
-        
                 // Highlight selected tab
                 $(self).parent().addClass('active');
 
diff --git a/src/main.html b/src/main.html
index 85d235fa..2b397d3e 100755
--- a/src/main.html
+++ b/src/main.html
@@ -269,7 +269,7 @@
             </ul>
             <ul class="mode-connected mode-connected-cli">
                 <li class="tab_cli">
-                    <a href="#" i18n="tabCLI" class="tabicon ic_cli" i18n_title="tabCLI" data-ignore-reopen="true"></a>
+                    <a href="#" i18n="tabCLI" class="tabicon ic_cli" i18n_title="tabCLI"></a>
                 </li>
             </ul>
         </div>