diff --git a/PlayWall/assets/de/tobias/playpad/assets/view/main/desktop/header.fxml b/PlayWall/assets/de/tobias/playpad/assets/view/main/desktop/header.fxml
index 7cb4ef9a750e598895f05c920a874a35a6c5246b..d80d50eb1cb08fc1ca50320c4ec9d8af4d072b84 100644
--- a/PlayWall/assets/de/tobias/playpad/assets/view/main/desktop/header.fxml
+++ b/PlayWall/assets/de/tobias/playpad/assets/view/main/desktop/header.fxml
@@ -51,7 +51,7 @@
                               <KeyCodeCombination alt="UP" code="J" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
                            </accelerator>
                         </MenuItem>
-                        <MenuItem fx:id="pageMenu" mnemonicParsing="false" text="%main.menuitem.page">
+                        <MenuItem fx:id="pageMenu" mnemonicParsing="false" onAction="#pageMenuHandler" text="%main.menuitem.page">
                            <accelerator>
                               <KeyCodeCombination alt="UP" code="K" control="UP" meta="UP" shift="UP" shortcut="DOWN" />
                            </accelerator>
diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
index 6f49ecf00296ce1ea52dccf732e03f08b46c91de..2e7f4e6660a66514b58f1d686892417bf946f3cc 100644
--- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java
@@ -84,7 +84,7 @@ public class PlayPadMain extends Application implements LocalizationDelegate {
 	public void init() throws Exception {
 		App app = ApplicationUtils.getApplication();
 
-		Path globalSettingsPath = app.getPath(PathType.CONFIGURATION, "GlobalSettings.yml");
+		Path globalSettingsPath = app.getPath(PathType.CONFIGURATION, "GlobalSettings.xml");
 		GlobalSettings globalSettings = GlobalSettings.load(globalSettingsPath);
 
 		impl = new PlayPadImpl(globalSettings);
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
index 641a812ba4c4e43a87623992b38942d4025cb5be..d36cee921cab9ce00daf3b7e440c35fb7c19f76d 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java
@@ -561,6 +561,11 @@ public class DesktopMenuToolbarViewController extends BasicMenuToolbarViewContro
 	void dragMenuHandler(ActionEvent event) {
 		connect.setEditMode(DesktopEditMode.DRAG);
 	}
+	
+	@FXML
+	void pageMenuHandler(ActionEvent event) {
+		connect.setEditMode(DesktopEditMode.PAGE);
+	}
 
 	@FXML
 	void colorMenuHandler(ActionEvent event) {
diff --git a/PlayWallCore/src/de/tobias/playpad/project/Project.java b/PlayWallCore/src/de/tobias/playpad/project/Project.java
index c4de04d5548eabf5d2a46f31ef18dd2cd4a98f48..449c23b1e5be05ea5cf7326caa94292241189a2c 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/Project.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/Project.java
@@ -110,10 +110,12 @@ public class Project {
 
 	public void setPad(PadIndex index, Pad pad) {
 		if (pad != null) {
-
 			if (pad.getPage() != index.getPage()) {
 				Page oldPage = getPage(pad.getPage());
-				oldPage.removePade(index.getId());
+				// Nur Löschen, wenn auch noch das Pad an dieser Stelle ist, und nicht an andere Stelle
+				if (oldPage.getPad(pad.getIndex()).equals(pad)) {
+					oldPage.removePade(index.getId());
+				}
 			}
 		}
 		Page page = pages.get(index.getPage());