diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue
index e3c7b0eb99c..7feac51b6b6 100644
--- a/src/components/TopBar/CallButton.vue
+++ b/src/components/TopBar/CallButton.vue
@@ -221,8 +221,6 @@ export default {
 				participantIdentifier: this.$store.getters.getParticipantIdentifier(),
 			})
 			this.loading = false
-			// Go back to promoted view upon leaving a call
-			this.$store.dispatch('isGrid', false)
 		},
 	},
 }
diff --git a/src/store/callViewStore.js b/src/store/callViewStore.js
index 52eb576ed95..7be1eab7bfe 100644
--- a/src/store/callViewStore.js
+++ b/src/store/callViewStore.js
@@ -20,6 +20,11 @@
  *
  */
 
+import BrowserStorage from '../services/BrowserStorage'
+import {
+	CONVERSATION,
+} from '../constants'
+
 const state = {
 	isGrid: false,
 	selectedVideoPeerId: null,
@@ -49,12 +54,30 @@ const mutations = {
 }
 
 const actions = {
+	/**
+	 * Sets the current grid mode and saves it in preferences.
+	 *
+	 * @param {object} context default store context;
+	 * @param {bool} value true for enabled grid mode, false for speaker view;
+	 */
 	isGrid(context, value) {
+		BrowserStorage.setItem('callprefs-' + context.getters.getToken() + '-isgrid', value)
 		context.commit('isGrid', value)
 	},
 	selectedVideoPeerId(context, value) {
 		context.commit('selectedVideoPeerId', value)
 	},
+
+	joinCall(context, { token }) {
+		let isGrid = BrowserStorage.getItem('callprefs-' + token + '-isgrid')
+		if (isGrid === null) {
+			const conversationType = context.getters.conversations[token].type
+			// default to grid view for group/public calls, otherwise speaker view
+			isGrid = (conversationType === CONVERSATION.GROUP
+				|| conversationType === CONVERSATION.PUBLIC)
+		}
+		context.dispatch('isGrid', isGrid)
+	},
 }
 
 export default { state, mutations, getters, actions }