diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ca1074b..d70a3a9 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2175,9 +2175,9 @@
             return;
         }
 
-        if (v instanceof PageIndicator) {
-            if (!mWorkspace.isInOverviewMode()) {
-                mWorkspace.enterOverviewMode();
+        if (v instanceof Workspace) {
+            if (mWorkspace.isInOverviewMode()) {
+                mWorkspace.exitOverviewMode(true);
             }
             return;
         }
@@ -2589,6 +2589,15 @@
         if (isWorkspaceLocked()) return false;
         if (mState != State.WORKSPACE) return false;
 
+        if (v instanceof Workspace) {
+            if (!mWorkspace.isInOverviewMode()) {
+                mWorkspace.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
+                        HapticFeedbackConstants.FLAG_IGNORE_VIEW_SETTING);
+                mWorkspace.enterOverviewMode();
+            }
+            return true;
+        }
+
         if (!(v instanceof CellLayout)) {
             v = (View) v.getParent().getParent();
         }