diff --git a/src/gui/ControllerBindingsGui.hx b/src/gui/ControllerBindingsGui.hx
index 4bdc8672..b54795b1 100644
--- a/src/gui/ControllerBindingsGui.hx
+++ b/src/gui/ControllerBindingsGui.hx
@@ -87,12 +87,7 @@ class ControllerBindingsGui extends GuiImage {
 			}
 		}
 
-		#if hl
-		var scene2d = hxd.Window.getInstance();
-		#end
-		#if js
 		var scene2d = MarbleGame.instance.scene2d;
-		#end
 
 		var offsetX = (scene2d.width - 1280) / 2;
 		var offsetY = (scene2d.height - 720) / 2;
diff --git a/src/gui/InputSelectGui.hx b/src/gui/InputSelectGui.hx
index 00c5ca93..c735e8a6 100644
--- a/src/gui/InputSelectGui.hx
+++ b/src/gui/InputSelectGui.hx
@@ -25,12 +25,7 @@ class InputSelectGui extends GuiImage {
 		this.position = new Vector();
 		this.extent = new Vector(640, 480);
 
-		#if hl
-		var scene2d = hxd.Window.getInstance();
-		#end
-		#if js
 		var scene2d = MarbleGame.instance.scene2d;
-		#end
 
 		var offsetX = (scene2d.width - 1280) / 2;
 		var offsetY = (scene2d.height - 720) / 2;
@@ -64,8 +59,8 @@ class InputSelectGui extends GuiImage {
 		btnList.extent = new Vector(502, 500);
 		innerCtrl.addChild(btnList);
 
-		btnList.addButton(0, 'Keyboard Controls', (e) -> {
-			MarbleGame.canvas.setContent(new KeyBindingsGui(pauseGui));
+		btnList.addButton(0, 'Touch Controls', (e) -> {
+			MarbleGame.canvas.setContent(new TouchOptionsGui(pauseGui));
 		});
 		btnList.addButton(0, 'Gamepad Controls', (e) -> {
 			MarbleGame.canvas.setContent(new ControllerBindingsGui(pauseGui));
diff --git a/src/gui/LeaderboardsSelectGui.hx b/src/gui/LeaderboardsSelectGui.hx
index 7a7b2d5f..fcfc0f1f 100644
--- a/src/gui/LeaderboardsSelectGui.hx
+++ b/src/gui/LeaderboardsSelectGui.hx
@@ -25,12 +25,7 @@ class LeaderboardsSelectGui extends GuiImage {
 		this.position = new Vector();
 		this.extent = new Vector(640, 480);
 
-		#if hl
-		var scene2d = hxd.Window.getInstance();
-		#end
-		#if js
 		var scene2d = MarbleGame.instance.scene2d;
-		#end
 
 		var offsetX = (scene2d.width - 1280) / 2;
 		var offsetY = (scene2d.height - 720) / 2;
diff --git a/src/gui/OptionsListGui.hx b/src/gui/OptionsListGui.hx
index 304adc07..9d76ea8b 100644
--- a/src/gui/OptionsListGui.hx
+++ b/src/gui/OptionsListGui.hx
@@ -65,6 +65,11 @@ class OptionsListGui extends GuiImage {
 		btnList.addButton(3, 'Input and Sound Options', (e) -> {
 			MarbleGame.canvas.setContent(new InputOptionsGui(pauseGui));
 		});
+
+		btnList.addButton(3, 'Input Controls', (e) -> {
+			MarbleGame.canvas.setContent(new InputSelectGui(pauseGui));
+		});
+
 		if (Util.isTouchDevice()) {
 			if (!pauseGui) {
 				btnList.addButton(3, 'Touch Controls', (e) -> {
diff --git a/src/gui/TouchOptionsGui.hx b/src/gui/TouchOptionsGui.hx
index 04fa126a..ccffcfa7 100644
--- a/src/gui/TouchOptionsGui.hx
+++ b/src/gui/TouchOptionsGui.hx
@@ -114,12 +114,12 @@ class TouchOptionsGui extends GuiImage {
 			backButton.pressedAction = (e) -> {
 				Settings.applySettings();
 				MarbleGame.canvas.popDialog(this);
-				MarbleGame.canvas.pushDialog(new OptionsListGui(true));
+				MarbleGame.canvas.pushDialog(new InputSelectGui(true));
 			}
 		else
 			backButton.pressedAction = (e) -> {
 				Settings.applySettings();
-				MarbleGame.canvas.setContent(new OptionsListGui());
+				MarbleGame.canvas.setContent(new InputSelectGui());
 			};
 		bottomBar.addChild(backButton);