diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index a18047fadc..1085083f52 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -1621,6 +1621,13 @@ public class Workspace extends SmoothPagedView
             originY = (int)mTempOriginXY[1];
         }
 
+        // When you drag to a particular screen, make that the new current/default screen, so any
+        // subsequent taps add items to that screen
+        int dragTargetIndex = indexOfChild(mDragTargetLayout);
+        if (mCurrentPage != dragTargetIndex && (mIsSmall || mIsInUnshrinkAnimation)) {
+            moveToNewPageWithoutMovingCellLayouts(dragTargetIndex);
+        }
+
         if (source != this) {
             if (!mIsSmall || mWasSpringLoadedOnDragExit) {
                 onDropExternal(originX, originY, dragInfo, mDragTargetLayout, false);