diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
index 4b8ad7f5d8e78a4ec3202bf26d02b0c11a6a61ce..ae369ccae5a1a44dd98605255845eeca8d66c172 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
@@ -149,6 +149,17 @@ public class DesktopPadViewController implements IPadViewControllerV2, EventHand
 
 		this.padDragListener = null;
 		this.pad = null;
+
+		// Remove SettingsView Reference
+		if (padSettingsViewController != null) {
+			padSettingsViewController.getStage().close();
+			padSettingsViewController = null;
+		}
+
+		// Hide Loading Animation
+		if (getView() != null)
+			getView().showBusyView(false);
+
 	}
 
 	@Override