diff --git a/plugins/com.xored.glance.ui/src/com/xored/glance/internal/ui/panels/SearchStatusLine.java b/plugins/com.xored.glance.ui/src/com/xored/glance/internal/ui/panels/SearchStatusLine.java
index 1e99e3d..4a0010d 100644
--- a/plugins/com.xored.glance.ui/src/com/xored/glance/internal/ui/panels/SearchStatusLine.java
+++ b/plugins/com.xored.glance.ui/src/com/xored/glance/internal/ui/panels/SearchStatusLine.java
@@ -17,6 +17,8 @@
 import org.eclipse.jface.action.StatusLineManager;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.graphics.Image;
@@ -46,7 +48,6 @@ public class SearchStatusLine extends SearchPanel {
     protected Control createText(Composite parent, int style) {
         Control textControl = super.createText(parent, style);
         textControl.addFocusListener(new FocusListener() {
-            
             @Override
             public void focusLost(FocusEvent e) {
                 setKeyFilter(true);
@@ -57,6 +58,12 @@ public void focusGained(FocusEvent e) {
                 setKeyFilter(false);
             }
         });
+        textControl.addDisposeListener(new DisposeListener() {
+            @Override
+            public void widgetDisposed(DisposeEvent e) {
+                setKeyFilter(true);
+            }
+        });
         return textControl;
     }
     
diff --git a/plugins/com.xored.glance.ui/src/com/xored/glance/ui/panels/SearchPanel.java b/plugins/com.xored.glance.ui/src/com/xored/glance/ui/panels/SearchPanel.java
index 117a9b7..7881f57 100644
--- a/plugins/com.xored.glance.ui/src/com/xored/glance/ui/panels/SearchPanel.java
+++ b/plugins/com.xored.glance.ui/src/com/xored/glance/ui/panels/SearchPanel.java
@@ -264,7 +264,7 @@ protected Control createText(final Composite parent, final int style) {
 			setBackground(false);
 		title.addModifyListener(modifyListener);
 		title.addListener(SWT.KeyDown, new Listener() {
-            @Override
+		    @Override
             public void handleEvent(Event event) {
                 GlanceEventDispatcher.INSTANCE.dispatchKeyPressed(event);
             }