diff --git a/src/main/java/client/gui/ClientGUI.java b/src/main/java/client/gui/ClientGUI.java
index 3009360..24fcae1 100644
--- a/src/main/java/client/gui/ClientGUI.java
+++ b/src/main/java/client/gui/ClientGUI.java
@@ -728,7 +728,7 @@ public void windowClosing(WindowEvent we) {
 
 		JLabel selectControlType = new JLabel("Select Controls:");
 		JComboBox<String> controlTypeSelection = new JComboBox<>(new String[]{TANK_CONTROLS, SIMPLE_CONTROLS});
-		controlTypeSelection.setSelectedItem(controlType);
+		controlTypeSelection.setSelectedItem(controlType == ControlType.TANK ? TANK_CONTROLS : SIMPLE_CONTROLS);
 		controlTypeSelection.setMaximumSize(toggleReadyButton.getSize());
 		controlTypeSelection.addActionListener(e -> {
 			switch ((String) Objects.requireNonNull(controlTypeSelection.getSelectedItem())) {