diff --git a/core/java/com/android/internal/policy/DividerSnapAlgorithm.java b/core/java/com/android/internal/policy/DividerSnapAlgorithm.java
index b8bc1618b3a3e..d6172db3d3697 100644
--- a/core/java/com/android/internal/policy/DividerSnapAlgorithm.java
+++ b/core/java/com/android/internal/policy/DividerSnapAlgorithm.java
@@ -86,7 +86,7 @@ public class DividerSnapAlgorithm {
         return new DividerSnapAlgorithm(ctx.getResources(),
                 displayInfo.logicalWidth, displayInfo.logicalHeight,
                 dividerWindowWidth - 2 * dividerInsets,
-                ctx.getResources().getConfiguration().orientation
+                ctx.getApplicationContext().getResources().getConfiguration().orientation
                         == Configuration.ORIENTATION_PORTRAIT,
                 insets);
     }
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
index 0e5ebc9173bb5..c692a16ba2a58 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java
@@ -193,7 +193,7 @@ public class RecentsViewTouchHandler {
     }
 
     public final void onBusEvent(ConfigurationChangedEvent event) {
-        if (event.fromDisplayDensityChange) {
+        if (event.fromDisplayDensityChange || event.fromDeviceOrientationChange) {
             updateSnapAlgorithm();
         }
     }