diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
index 212666f24b36c..3a6756bb677ff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/EdgeBackGestureHandler.java
@@ -204,6 +204,7 @@ public class EdgeBackGestureHandler implements DisplayListener {
 
         if (!mIsEnabled) {
             WindowManagerWrapper.getInstance().removePinnedStackListener(mImeChangedListener);
+            mContext.getSystemService(DisplayManager.class).unregisterDisplayListener(this);
 
             try {
                 WindowManagerGlobal.getWindowManagerService()
@@ -215,6 +216,8 @@ public class EdgeBackGestureHandler implements DisplayListener {
 
         } else {
             updateDisplaySize();
+            mContext.getSystemService(DisplayManager.class).registerDisplayListener(this,
+                    mContext.getMainThreadHandler());
 
             try {
                 WindowManagerWrapper.getInstance().addPinnedStackListener(mImeChangedListener);
@@ -344,7 +347,8 @@ public class EdgeBackGestureHandler implements DisplayListener {
 
     private void updateDisplaySize() {
         mContext.getSystemService(DisplayManager.class)
-                .getDisplay(mDisplayId).getRealSize(mDisplaySize);
+                .getDisplay(mDisplayId)
+                .getRealSize(mDisplaySize);
     }
 
     private void sendEvent(int action, int code) {