diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c
index 04a45d9a..06c9ff68 100644
--- a/src/overlays/ovl_menu/fox_title.c
+++ b/src/overlays/ovl_menu/fox_title.c
@@ -230,6 +230,10 @@ void Title_Main(void) {
 }
 
 void Title_UpdateEntry(void) {
+    
+    // LTODO: Verify this is correct
+    gMainController = Title_80187ABC();
+
     if (sTimer1 > 0) {
         sTimer1--;
     }
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index b8614a55..88ef3329 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -72,6 +72,9 @@ GameEngine::GameEngine() {
 void GameEngine::Create(){
     const auto instance = Instance = new GameEngine();
     GameUI::SetupGuiElements();
+#if defined(__SWITCH__) || defined(__WIIU__)
+    CVarRegisterInteger("gControlNav", 1); // always enable controller nav on switch/wii u
+#endif
 }
 
 void GameEngine::Destroy(){
diff --git a/src/sys/sys_joybus.c b/src/sys/sys_joybus.c
index c52cb8b9..da398eab 100644
--- a/src/sys/sys_joybus.c
+++ b/src/sys/sys_joybus.c
@@ -63,6 +63,7 @@ void Controller_UpdateInput(void) {
     s32 i;
 
     for (i = 0; i < 4; i++) {
+        gControllerPlugged[i] = osContGetStatus(i);
         if ((gControllerPlugged[i] == 1) && (sNextController[i].errno == 0)) {
             sPrevController[i] = gControllerHold[i];
             gControllerHold[i] = sNextController[i];