diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/EditScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/EditScreen.kt
index 333caee1..9c447e21 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/EditScreen.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/EditScreen.kt
@@ -151,7 +151,7 @@ fun EditScreenScaffoldWithAppBar(
                 },
                 actions = {
                     AboutButton { onAboutPressed() }
-                    if (couldRequestFullSpace()) {
+                    if (uiState.xrEnabled && couldRequestFullSpace()) {
                         RequestFullSpaceIconButton()
                     }
                 },
diff --git a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
index aca06a24..cdc2543c 100644
--- a/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
+++ b/feature/results/src/main/java/com/android/developers/androidify/results/ResultsScreen.kt
@@ -138,11 +138,13 @@ fun ResultsScreenContents(
             },
             actions = {
                 AboutButton { onAboutPress() }
-                if (couldRequestFullSpace()) {
-                    RequestFullSpaceIconButton()
-                }
-                if (couldRequestHomeSpace()) {
-                    RequestHomeSpaceIconButton()
+                if (state.xrEnabled) {
+                    if (couldRequestFullSpace()) {
+                        RequestFullSpaceIconButton()
+                    }
+                    if (couldRequestHomeSpace()) {
+                        RequestHomeSpaceIconButton()
+                    }
                 }
             },
         )