diff --git a/content/events.js b/content/events.js
index 84b9d31b..b2196dfe 100644
--- a/content/events.js
+++ b/content/events.js
@@ -202,9 +202,8 @@ vimperator.Events = function () //{{{
     }, false);
     tabcontainer.addEventListener("TabSelect", function (event)
     {
-        if (vimperator.mode == vimperator.modes.HINTS || vimperator.mode == vimperator.modes.CUSTOM )
-            vimperator.modes.reset();
-
+        // TODO: is all of that necessary?
+        vimperator.modes.reset();
         vimperator.commandline.clear();
         vimperator.modes.show();
         vimperator.statusline.updateTabCount();