diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index c4f6373127d..39875657c45 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -359,9 +359,7 @@ export default {
 		document.addEventListener('MSFullscreenChange', this.fullScreenChanged, false)
 		document.addEventListener('webkitfullscreenchange', this.fullScreenChanged, false)
 		// Add call layout hint listener
-		EventBus.$on('toggleLayoutHint', (display) => {
-			this.showLayoutHint = display
-		})
+		EventBus.$on('toggleLayoutHint', this.handleToggleLayoutHint)
 	},
 
 	beforeDestroy() {
@@ -370,9 +368,7 @@ export default {
 		document.removeEventListener('MSFullscreenChange', this.fullScreenChanged, false)
 		document.removeEventListener('webkitfullscreenchange', this.fullScreenChanged, false)
 		// Remove call layout hint listener
-		EventBus.$off('toggleLayoutHint', (display) => {
-			this.showLayoutHint = display
-		})
+		EventBus.$off('toggleLayoutHint', this.handleToggleLayoutHint)
 	},
 
 	methods: {
@@ -489,6 +485,9 @@ export default {
 			this.$store.dispatch('isRenamingConversation', true)
 			this.$store.dispatch('showSidebar')
 		},
+		handleToggleLayoutHint(display) {
+			this.showLayoutHint = display
+		},
 		forceMuteOthers() {
 			callParticipantCollection.callParticipantModels.forEach(callParticipantModel => {
 				callParticipantModel.forceMute()