diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index c24424697c3..1b8828e88d0 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -647,7 +647,15 @@ export default {
 				return
 			}
 
-			this.$store.dispatch('startPresentation')
+			if (this.$store.getters.presentationStarted) {
+				this.$store.dispatch('setCallViewMode', {
+					isGrid: false,
+					isStripeOpen: false,
+					clearLast: false,
+				})
+			} else {
+				this.$store.dispatch('startPresentation')
+			}
 			this.$store.dispatch('selectedVideoPeerId', null)
 			this.screens.splice(index, 1)
 			this.screens.unshift(id)
diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue
index 0edab0daf25..543030a453d 100644
--- a/src/components/CallView/shared/VideoBottomBar.vue
+++ b/src/components/CallView/shared/VideoBottomBar.vue
@@ -273,7 +273,7 @@ export default {
 		},
 
 		switchToScreen() {
-			if (!this.sharedData.screenVisible) {
+			if (!this.sharedData.screenVisible || !this.isBig) {
 				emit('switch-screen-to-id', this.model.attributes.peerId)
 			}
 		},