diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp
index 220a87bd4..c3805ccd5 100644
--- a/src/core/analog_controller.cpp
+++ b/src/core/analog_controller.cpp
@@ -333,16 +333,17 @@ void AnalogController::SetAnalogMode(bool enabled, bool show_message)
   if (m_analog_mode == enabled)
     return;
 
+  m_analog_mode = enabled;
+
   INFO_LOG("Controller {} switched to {} mode.", m_index + 1u, m_analog_mode ? "analog" : "digital");
   if (show_message)
   {
     Host::AddIconOSDMessage(
       fmt::format("Controller{}AnalogMode", m_index), ICON_PF_GAMEPAD_ALT,
-      enabled ? fmt::format(TRANSLATE_FS("Controller", "Controller {} switched to analog mode."), m_index + 1u) :
-                fmt::format(TRANSLATE_FS("Controller", "Controller {} switched to digital mode."), m_index + 1u));
+      m_analog_mode ? fmt::format(TRANSLATE_FS("Controller", "Controller {} switched to analog mode."), m_index + 1u) :
+                      fmt::format(TRANSLATE_FS("Controller", "Controller {} switched to digital mode."), m_index + 1u),
+      Host::OSD_QUICK_DURATION);
   }
-
-  m_analog_mode = enabled;
 }
 
 void AnalogController::ProcessAnalogModeToggle()
@@ -355,7 +356,7 @@ void AnalogController::ProcessAnalogModeToggle()
                     TRANSLATE_FS("AnalogController", "Controller {} is locked to analog mode by the game.") :
                     TRANSLATE_FS("AnalogController", "Controller {} is locked to digital mode by the game."),
                   m_index + 1u),
-      5.0f);
+      Host::OSD_QUICK_DURATION);
   }
   else
   {