diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
index 8e56e4ba21984506aa3de729b38409ddd66cdf5c..1c239edc95aeb74d17ddf47cce72a9869293cb1c 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchMenuToolbarViewController.java
@@ -4,6 +4,7 @@ import de.tobias.playpad.PlayPadMain;
 import de.tobias.playpad.PlayPadPlugin;
 import de.tobias.playpad.Strings;
 import de.tobias.playpad.project.Project;
+import de.tobias.playpad.project.page.Page;
 import de.tobias.playpad.settings.Profile;
 import de.tobias.playpad.settings.keys.KeyCollection;
 import de.tobias.playpad.view.main.MainLayoutConnect;
@@ -51,7 +52,13 @@ public class TouchMenuToolbarViewController extends BasicMenuToolbarViewControll
 		}
 
 		for (int i = 0; i < openProject.getPages().size(); i++) {
-			Button button = new Button(Localization.getString(Strings.UI_Window_Main_PageButton, (i + 1)));
+			Page page = openProject.getPage(i);
+			String name = page.getName(); 
+			if (name.isEmpty()) {
+				name = Localization.getString(Strings.UI_Window_Main_PageButton, (i + 1));
+			}
+			
+			Button button = new Button(name);
 			button.setUserData(i);
 			button.setFocusTraversable(false);
 			button.setOnAction(this);