diff --git a/frontend/components/Layout/AppBar/AppBar.vue b/frontend/components/Layout/AppBar/AppBar.vue
index 7e1ecff977e..6ea53bbf607 100644
--- a/frontend/components/Layout/AppBar/AppBar.vue
+++ b/frontend/components/Layout/AppBar/AppBar.vue
@@ -49,12 +49,13 @@
         }}</span>
       </template>
     </app-bar-button-layout>
-    <cast-button
+    <!-- Uncomment when some of the remote play features are fully implemented -->
+    <!-- <cast-button
       :fab="
         !(!page.transparentLayout || $vuetify.breakpoint.xsOnly) &&
         !page.isScrolled
       "
-    />
+    /> -->
     <user-button />
     <locale-switcher
       :fab="
diff --git a/frontend/components/Layout/AppBar/Buttons/TaskManagerButton.vue b/frontend/components/Layout/AppBar/Buttons/TaskManagerButton.vue
index c60d42a950b..81a6cd62202 100644
--- a/frontend/components/Layout/AppBar/Buttons/TaskManagerButton.vue
+++ b/frontend/components/Layout/AppBar/Buttons/TaskManagerButton.vue
@@ -3,7 +3,7 @@
     v-if="showButton"
     v-model="menu"
     :close-on-content-click="false"
-    :close-on-click="$vuetify.breakpoint.mobile"
+    close-on-click
     :transition="'slide-y-transition'"
     bottom
     :nudge-bottom="nudgeBottom"