diff --git a/src/components/AppNavigation/AppNavigation.vue b/src/components/AppNavigation/AppNavigation.vue
index 1cf3b667a1..2ea312a47b 100644
--- a/src/components/AppNavigation/AppNavigation.vue
+++ b/src/components/AppNavigation/AppNavigation.vue
@@ -188,4 +188,11 @@ export default {
 	}
 }
 
+// Put the toggle behind appsidebar on small screens
+@media only screen and (max-width: math.div($breakpoint-mobile, 2)) {
+	.app-navigation {
+		z-index: 1400;
+	}
+}
+
 </style>
diff --git a/src/components/AppSidebar/AppSidebar.vue b/src/components/AppSidebar/AppSidebar.vue
index c562dc6e74..49d463ba82 100644
--- a/src/components/AppSidebar/AppSidebar.vue
+++ b/src/components/AppSidebar/AppSidebar.vue
@@ -847,6 +847,13 @@ $top-buttons-spacing: 6px;
 	}
 }
 
+// Make the sidebar full-width on small screens
+@media only screen and (max-width: math.div($breakpoint-mobile, 2)) {
+	.app-sidebar {
+		width: 100vw;
+	}
+}
+
 .slide-right-leave-active,
 .slide-right-enter-active {
 	transition-duration: var(--animation-quick);