diff --git a/termite.cc b/termite.cc
index f40c12a..c944f78 100644
--- a/termite.cc
+++ b/termite.cc
@@ -602,17 +602,17 @@ gboolean entry_key_press_cb(GtkEntry *entry, GdkEventKey *event, keybind_info *i
                 break;
         }
         ret = TRUE;
-    } else if (info->panel.mode == overlay_mode::completion) {
-        if (event->keyval == GDK_KEY_Tab) {
-            synthesize_keypress(GTK_WIDGET(entry), GDK_KEY_Down);
-            return TRUE;
-        } else if (event->keyval == GDK_KEY_ISO_Left_Tab) {
-            synthesize_keypress(GTK_WIDGET(entry), GDK_KEY_Up);
-            return TRUE;
-        } else if (event->keyval == GDK_KEY_Down) {
-            // this stops the down key from leaving the GtkEntry...
-            event->hardware_keycode = 0;
-        }
+    }
+
+    if (event->keyval == GDK_KEY_Tab) {
+        synthesize_keypress(GTK_WIDGET(entry), GDK_KEY_Down);
+        return TRUE;
+    } else if (event->keyval == GDK_KEY_ISO_Left_Tab) {
+        synthesize_keypress(GTK_WIDGET(entry), GDK_KEY_Up);
+        return TRUE;
+    } else if (event->keyval == GDK_KEY_Down) {
+        // this stops the down key from leaving the GtkEntry...
+        event->hardware_keycode = 0;
     }
 
     if (ret) {