diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 81d55547ff..3c32ecbef3 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -479,6 +479,7 @@ add_library(core
   PrimeHack/Mods/SkipCutscene.h
   PrimeHack/Mods/SpringballButton.cpp
   PrimeHack/Mods/ViewModifier.cpp
+  PrimeHack/Mods/ContextSensitiveControls.cpp
   PrimeHack/HackConfig.cpp
   PrimeHack/HackManager.cpp
   PrimeHack/Transform.cpp
diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp
index 58bea74f9e..8ff2ffe516 100644
--- a/Source/Core/Core/HW/GCPadEmu.cpp
+++ b/Source/Core/Core/HW/GCPadEmu.cpp
@@ -293,7 +293,7 @@ void GCPad::LoadDefaults(const ControllerInterface& ciface)
 
   // Triggers
   m_triggers->SetControlExpression(0, "Shift");  // L
-  m_triggers->SetControlExpression(2, "Shift");  // R
+  m_triggers->SetControlExpression(2, "Shift");
 }
 
 bool GCPad::GetMicButton() const