diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index 3ffc7fae5d0a1..bdda944f236bc 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -714,10 +714,11 @@ public class TaskStack extends WindowContainer<Task> implements
     @Override
     public void onConfigurationChanged(Configuration newParentConfig) {
         final int prevWindowingMode = getWindowingMode();
+        super.onConfigurationChanged(newParentConfig);
+
         // Only need to update surface size here since the super method will handle updating
         // surface position.
         updateSurfaceSize(getPendingTransaction());
-        super.onConfigurationChanged(newParentConfig);
         final int windowingMode = getWindowingMode();
 
         if (mDisplayContent == null || prevWindowingMode == windowingMode) {