diff --git a/src/core/controller.cpp b/src/core/controller.cpp
index f242cff76..5cccc27c4 100644
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -95,7 +95,8 @@ std::unique_ptr<Controller> Controller::Create(ControllerType type, u32 index)
 
 const char* Controller::GetDefaultPadType(u32 pad)
 {
-  return (pad == 0) ? "DigitalController" : "None";
+  return Settings::GetControllerTypeName((pad == 0) ? Settings::DEFAULT_CONTROLLER_1_TYPE :
+                                                      Settings::DEFAULT_CONTROLLER_2_TYPE);
 }
 
 const Controller::ControllerInfo* Controller::GetControllerInfo(ControllerType type)
diff --git a/src/core/settings.h b/src/core/settings.h
index 7bdcf1390..54721ba59 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -413,7 +413,7 @@ struct Settings
 
   static constexpr u8 DEFAULT_CDROM_READAHEAD_SECTORS = 8;
 
-  static constexpr ControllerType DEFAULT_CONTROLLER_1_TYPE = ControllerType::DigitalController;
+  static constexpr ControllerType DEFAULT_CONTROLLER_1_TYPE = ControllerType::AnalogController;
   static constexpr ControllerType DEFAULT_CONTROLLER_2_TYPE = ControllerType::None;
   static constexpr MemoryCardType DEFAULT_MEMORY_CARD_1_TYPE = MemoryCardType::PerGameTitle;
   static constexpr MemoryCardType DEFAULT_MEMORY_CARD_2_TYPE = MemoryCardType::None;