diff --git a/src/gui/EndGameGui.hx b/src/gui/EndGameGui.hx
index db2aeb82..aaaddbef 100644
--- a/src/gui/EndGameGui.hx
+++ b/src/gui/EndGameGui.hx
@@ -52,6 +52,12 @@ class EndGameGui extends GuiControl {
 		restartButton.extent = new Vector(104, 48);
 		restartButton.pressedAction = restartFunc;
 
+		function setButtonStates(enabled:Bool) {
+			nextLevelBtn.disabled = !enabled;
+			continueButton.disabled = !enabled;
+			restartButton.disabled = !enabled;
+		}
+
 		var arial14fontdata = ResourceLoader.getFileEntry("data/font/arial.fnt");
 		var arial14b = new BitmapFont(arial14fontdata.entry);
 		@:privateAccess arial14b.loader = ResourceLoader.loader;
@@ -173,7 +179,9 @@ class EndGameGui extends GuiControl {
 		Settings.save();
 
 		if (idx <= 2) {
+			setButtonStates(false);
 			var end = new EnterNameDlg(idx, (name) -> {
+				setButtonStates(true);
 				if (scoreSubmitted)
 					return;
 
diff --git a/src/gui/EnterNameDlg.hx b/src/gui/EnterNameDlg.hx
index 46bebc74..57e5143e 100644
--- a/src/gui/EnterNameDlg.hx
+++ b/src/gui/EnterNameDlg.hx
@@ -61,6 +61,9 @@ class EnterNameDlg extends GuiControl {
 		enterNameEdit.position = new Vector(87, 136);
 		enterNameEdit.extent = new Vector(255, 36);
 		enterNameEdit.text.text = Settings.highscoreName;
+		haxe.Timer.delay(() -> {
+			enterNameEdit.text.focus();
+		}, 5);
 
 		var okbutton = new GuiButton(loadButtonImages("data/ui/common/ok"));
 		okbutton.position = new Vector(163, 182);