diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index d99e9af5ad..a79d236b02 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1483,7 +1483,7 @@ public class Workspace extends SmoothPagedView
         // If it's an external drop (e.g. from All Apps), check if it should be accepted
         if (source != this) {
             // Don't accept the drop if we're not over a screen at time of drop
-            if (mDragTargetLayout == null) {
+            if (mDragTargetLayout == null || !mDragTargetLayout.getAcceptsDrops()) {
                 return false;
             }
 
@@ -1931,7 +1931,7 @@ public class Workspace extends SmoothPagedView
                         mDragTargetLayout.setHover(false);
                     }
                     mDragTargetLayout = layout;
-                    if (mDragTargetLayout != null) {
+                    if (mDragTargetLayout != null && mDragTargetLayout.getAcceptsDrops()) {
                         mDragTargetLayout.setHover(true);
                     }
                 }