diff --git a/src/components/paneDisplayComponents/streamDisplay.vue b/src/components/paneDisplayComponents/streamDisplay.vue
index d8e3343d..d1b9fad2 100644
--- a/src/components/paneDisplayComponents/streamDisplay.vue
+++ b/src/components/paneDisplayComponents/streamDisplay.vue
@@ -40,13 +40,6 @@ export default {
 			console.log(`Toggling preview to ${state}`)
 			this.previewRequest(state)
 		})
-
-		this.$root.$on('globalReenablePreview', () => {
-			if (this.$store.state.settings.autoGpuPreview) {
-				console.log("Re-enabling preview")
-				this.previewRequest(true)
-			}
-		})
 	},
 
 	created: function () {
diff --git a/src/main.js b/src/main.js
index dadfe176..d66b000b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,7 +24,10 @@ Vue.mixin({
         .finally(function() {
           // Reenable the GPU preview, if it was active before the modal
           console.log("Re-enabling GPU preview")
-          self.$root.$emit('globalReenablePreview')
+          if (self.$store.state.settings.autoGpuPreview) {
+            console.log("Re-enabling preview")
+            self.$root.$emit('globalTogglePreview', true)
+          }
         })
       }
       return new Promise(showModal)