diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 1b105d2..b260ae3 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -478,8 +478,7 @@
 
         // For example, the user would PICK_SHORTCUT for "Music playlist", and we
         // launch over to the Music app to actually CREATE_SHORTCUT.
-        if (resultCode == RESULT_OK && mPendingAddInfo.container != ItemInfo.NO_ID  &&
-                mPendingAddInfo.screen > -1) {
+        if (resultCode == RESULT_OK && mPendingAddInfo.container != ItemInfo.NO_ID) {
             final PendingAddArguments args = new PendingAddArguments();
             args.requestCode = requestCode;
             args.intent = data;
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index ce3aad4..ede08cc 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -2809,8 +2809,7 @@
                 }
             }
             if (layout == null) {
-                layout = findMatchingPageForDragOver(d.dragView, mDragViewVisualCenter[0],
-                    mDragViewVisualCenter[1], true);
+                layout = findMatchingPageForDragOver(d.dragView, d.x, d.y, true);
             }
             if (layout != mDragTargetLayout) {
                 // Cancel all intermediate folder states
