diff --git a/src/com/android/launcher/GesturesPanel.java b/src/com/android/launcher/GesturesPanel.java
index 2d8647d..c0fce47 100644
--- a/src/com/android/launcher/GesturesPanel.java
+++ b/src/com/android/launcher/GesturesPanel.java
@@ -56,14 +56,14 @@
                 return ((Launcher) mContext).getWorkspace().getRootView().dispatchKeyEvent(event);
         }
         
-        if (keyCode == KeyEvent.KEYCODE_BACK &&
-                event.getAction() == KeyEvent.ACTION_DOWN) {
-
-            ((Launcher) mContext).hideGesturesPanel();
-
-            return true;
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                ((Launcher) mContext).hideGesturesPanel();
+                return true;
+            }
+        } else {
+            return super.dispatchKeyEvent(event);
         }
-
-        return super.dispatchKeyEvent(event);
+        return false;
     }
 }
