diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 43b12ed..f846b51 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -621,6 +621,8 @@
         // Some launcher layouts don't have a previous and next view
         if (mPreviousView != null) {
             dismissPreview(mPreviousView);
+        }
+        if (mNextView != null) {
             dismissPreview(mNextView);
         }
         mDragController.cancelDrag();
@@ -1126,8 +1128,13 @@
 
         getContentResolver().unregisterContentObserver(mWidgetObserver);
 
-        dismissPreview(mPreviousView);
-        dismissPreview(mNextView);
+        // Some launcher layouts don't have a previous and next view
+        if (mPreviousView != null) {
+            dismissPreview(mPreviousView);
+        }
+        if (mNextView != null) {
+            dismissPreview(mNextView);
+        }
 
         unregisterReceiver(mCloseSystemDialogsReceiver);
     }