diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
index b2bf4ab78fee9e28884c81cd21fb457db7f1f677..ec8f51a3dfc669a93d119794e71e1f9b2d29ee48 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/main/MainViewController.java
@@ -363,6 +363,7 @@ public class MainViewController extends NVC implements IMainViewController, Noti
 				}
 			}
 		}
+		Platform.exit();
 		return true;
 	}
 
diff --git a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/ContentPluginMain.scala b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/ContentPluginMain.scala
index 7964259514fae9232b375e66e3db7c29596a80d9..2756703ed75e039767b9c5ba3e09324f46653b98 100644
--- a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/ContentPluginMain.scala
+++ b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/ContentPluginMain.scala
@@ -28,7 +28,7 @@ class ContentPluginMain extends PlayPadPluginStub with SettingsListener with Pro
 	}
 
 	override def shutdown(): Unit = {
-
+		ContentPluginMain.playerViewController.getStageContainer.ifPresent(container => container.forceClose())
 	}
 
 	override def getModule: Module = module
diff --git a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/player/ContentPlayerViewController.scala b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/player/ContentPlayerViewController.scala
index 5a71719da29217ab579a4c94fd02fc14928796e7..161313d0d969283e183f58020ed9733bb1778f5b 100644
--- a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/player/ContentPlayerViewController.scala
+++ b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/player/ContentPlayerViewController.scala
@@ -1,8 +1,8 @@
 package de.tobias.playpad.plugin.content.player
 
 import de.thecodelabs.logger.Logger
-import de.thecodelabs.utils.ui.NVC
 import de.thecodelabs.utils.ui.size.IgnoreStageSizing
+import de.thecodelabs.utils.ui.{NVC, NVCStage}
 import de.tobias.playpad.plugin.content.settings.{Zone, ZoneConfiguration}
 import de.tobias.playpad.project.page.PadIndex
 import javafx.geometry.Insets
@@ -19,7 +19,9 @@ class ContentPlayerViewController extends NVC {
 	private val mediaStacks: ListBuffer[MediaPlayerStack] = ListBuffer.empty
 
 	load("view", "PlayerView")
-	applyViewControllerToStage
+	private val stageContainer: NVCStage = applyViewControllerToStage
+	stageContainer.addCloseHook(() => false)
+
 	Logger.debug("Create Player View Controller")
 
 	override def init(): Unit = {