diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 445831c599..ba5ec51cbc 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -963,6 +963,9 @@ public class Launcher extends Activity
     protected void onStop() {
         super.onStop();
         FirstFrameAnimatorHelper.setIsVisible(false);
+        if (Utilities.isNycOrAbove()) {
+            mAppWidgetHost.stopListening();
+        }
 
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onStop();
@@ -973,6 +976,9 @@ public class Launcher extends Activity
     protected void onStart() {
         super.onStart();
         FirstFrameAnimatorHelper.setIsVisible(true);
+        if (Utilities.isNycOrAbove()) {
+            mAppWidgetHost.startListening();
+        }
 
         if (mLauncherCallbacks != null) {
             mLauncherCallbacks.onStart();
diff --git a/src/com/android/launcher3/LauncherAppWidgetHost.java b/src/com/android/launcher3/LauncherAppWidgetHost.java
index 8c23ff30d7..1510558f19 100644
--- a/src/com/android/launcher3/LauncherAppWidgetHost.java
+++ b/src/com/android/launcher3/LauncherAppWidgetHost.java
@@ -82,12 +82,6 @@ public class LauncherAppWidgetHost extends AppWidgetHost {
         }
     }
 
-    @Override
-    public void stopListening() {
-        super.stopListening();
-        clearViews();
-    }
-
     public void addProviderChangeListener(Runnable callback) {
         mProviderChangeListeners.add(callback);
     }