diff --git a/Source/RMG-Input/UserInterface/MainDialog.cpp b/Source/RMG-Input/UserInterface/MainDialog.cpp
index 0c816a2f..efcdfbec 100644
--- a/Source/RMG-Input/UserInterface/MainDialog.cpp
+++ b/Source/RMG-Input/UserInterface/MainDialog.cpp
@@ -139,12 +139,14 @@ void MainDialog::openInputDevice(QString deviceName, int deviceNum)
         }
     }
 
-    if (SDL_IsGameController(deviceNum) == SDL_TRUE)
+    int controllerMode = CoreSettingsGetIntValue(SettingsID::Input_ControllerMode);
+    if ((controllerMode == 0 && SDL_IsGameController(deviceNum) == SDL_TRUE) ||
+        (controllerMode == 2))
     {
         this->currentJoystick = nullptr;
         this->currentController = SDL_GameControllerOpen(deviceNum);
     }
-    else
+    else if (controllerMode == 0 || controllerMode == 1)
     {
         this->currentJoystick = SDL_JoystickOpen(deviceNum);
         this->currentController = nullptr;
diff --git a/Source/RMG-Input/UserInterface/OptionsDialog.cpp b/Source/RMG-Input/UserInterface/OptionsDialog.cpp
index b27a3303..b56938a9 100644
--- a/Source/RMG-Input/UserInterface/OptionsDialog.cpp
+++ b/Source/RMG-Input/UserInterface/OptionsDialog.cpp
@@ -31,6 +31,9 @@ OptionsDialog::OptionsDialog(QWidget* parent, OptionsDialogSettings settings,
     this->filterEventsForButtonsCheckBox->setChecked(settings.FilterEventsForButtons);
     this->filterEventsForAxisCheckBox->setChecked(settings.FilterEventsForAxis);
 
+    // global settings
+    this->sdlControllerModeComboBox->setCurrentIndex(CoreSettingsGetIntValue(SettingsID::Input_ControllerMode));
+
     if (!CoreIsEmulationRunning() && !CoreIsEmulationPaused())
     {
         this->hideEmulationInfoText();
@@ -86,6 +89,9 @@ void OptionsDialog::accept()
     this->settings.FilterEventsForButtons = this->filterEventsForButtonsCheckBox->isChecked();
     this->settings.FilterEventsForAxis = this->filterEventsForAxisCheckBox->isChecked();
 
+    // save global settings now
+    CoreSettingsSetValue(SettingsID::Input_ControllerMode, this->sdlControllerModeComboBox->currentIndex());
+
     QDialog::accept();
 }
 
diff --git a/Source/RMG-Input/UserInterface/OptionsDialog.ui b/Source/RMG-Input/UserInterface/OptionsDialog.ui
index a6a427a2..6bebc882 100644
--- a/Source/RMG-Input/UserInterface/OptionsDialog.ui
+++ b/Source/RMG-Input/UserInterface/OptionsDialog.ui
@@ -238,6 +238,56 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_4">
+      <attribute name="title">
+       <string>Advanced</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>SDL controller mode</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="sdlControllerModeComboBox">
+           <item>
+            <property name="text">
+             <string>Automatic</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Joystick</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Controller</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Orientation::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>322</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>