diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index edfd6ef04473d..fc4d12ca57cad 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1760,6 +1760,11 @@ public class Activity extends ContextThemeWrapper
      */
     private void initActionBar() {
         Window window = getWindow();
+
+        // Initializing the window decor can change window feature flags.
+        // Make sure that we have the correct set before performing the test below.
+        window.getDecorView();
+
         if (isChild() || !window.hasFeature(Window.FEATURE_ACTION_BAR) || mActionBar != null) {
             return;
         }