diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlaylistTabViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlaylistTabViewController.java
index c75ddd786265889bf41cf55c7fcb74e2c8bf5826..39301ef9614df97c24e490e779f097b096c2af4d 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlaylistTabViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlaylistTabViewController.java
@@ -149,5 +149,9 @@ public class PlaylistTabViewController extends PadSettingsTabViewController {
 		MediaPath mediaPath = mediaPathListView.getSelectionModel().getSelectedItem();
 		pad.getContent().unloadMedia(mediaPath);
 		pad.removePath(mediaPath);
+
+		if (pad.getPaths().isEmpty()) {
+			pad.clear();
+		}
 	}
 }