diff --git a/Source/Project64-input/CProject64Input.cpp b/Source/Project64-input/CProject64Input.cpp
index e831fc489..f45450bd1 100644
--- a/Source/Project64-input/CProject64Input.cpp
+++ b/Source/Project64-input/CProject64Input.cpp
@@ -7,7 +7,7 @@ CProject64Input::CProject64Input(HINSTANCE hinst) :
     m_hinst(hinst),
     m_Scanning(false),
     m_DisplayCtrlId(0),
-    m_iFirstController(0)
+    m_iFirstController(-1)
 {
     memset(m_Controllers, 0, sizeof(m_Controllers));
 }
@@ -19,15 +19,21 @@ CProject64Input::~CProject64Input()
 void CProject64Input::InitiateControllers(CONTROL_INFO * ControlInfo)
 {
     CGuard guard(m_CS);
+    m_ControlInfo = *ControlInfo;
     if (m_DirectInput.get() == NULL)
     {
         m_DirectInput.reset(new CDirectInput(m_hinst));
     }
     m_DirectInput->Initiate(ControlInfo);
+    m_iFirstController = -1;
     for (size_t i = 0, n = sizeof(m_Controllers) / sizeof(m_Controllers[0]); i < n; i++)
     {
         g_Settings->LoadController(i, m_ControlInfo.Controls[i], m_Controllers[i]);
         m_DirectInput->MapControllerDevice(m_Controllers[i]);
+        if (m_ControlInfo.Controls[i].Present != 0 && m_iFirstController < 0)
+        {
+            m_iFirstController = i;
+        }
     }
 }
 
diff --git a/Source/Project64-input/InputConfigUI.cpp b/Source/Project64-input/InputConfigUI.cpp
index 5d56859f1..5e8610239 100644
--- a/Source/Project64-input/InputConfigUI.cpp
+++ b/Source/Project64-input/InputConfigUI.cpp
@@ -20,6 +20,7 @@ public:
     BEGIN_MSG_MAP(CDebugSettings)
         MSG_WM_INITDIALOG(OnInitDialog)
         MSG_WM_CTLCOLORSTATIC(OnCtlColorStatic)
+        COMMAND_HANDLER_EX(IDC_CHK_PLUGGED_IN, BN_CLICKED, ItemChanged)
         NOTIFY_HANDLER_EX(IDC_TACK_RANGE, NM_RELEASEDCAPTURE, ItemChangedNotify);
         MESSAGE_HANDLER(WM_HSCROLL, OnScroll)
         CHAIN_MSG_MAP(CPropertyPageImpl<CControllerSettings>)
@@ -32,6 +33,7 @@ public:
 
 private:
     LRESULT OnScroll(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+    void ItemChanged(UINT Code, int id, HWND ctl);
     LRESULT	ItemChangedNotify(NMHDR* /*pNMHDR*/);
     void ButtonChannged(void);
     static void stButtonChanged(size_t data) { ((CControllerSettings *)data)->ButtonChannged(); }
@@ -40,6 +42,7 @@ private:
     uint32_t m_ControllerNumber;
     uint32_t m_ScanCount;
     CBitmapPicture m_ControllerImg;
+    CButton m_PluggedIn;
     CTrackBarCtrl m_Range;
     CScanButton m_ButtonUDPad, m_ButtonDDPad, m_ButtonLDPad, m_ButtonRDPad;
     CScanButton m_ButtonCUp, m_ButtonCDown, m_ButtonCLeft, m_ButtonCRight;
@@ -77,6 +80,7 @@ CControllerSettings::CControllerSettings(uint32_t ControllerNumber) :
 BOOL CControllerSettings::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam*/)
 {
     N64CONTROLLER & Controller = g_InputPlugin->Controllers(m_ControllerNumber);
+    CONTROL & ControlInfo = g_InputPlugin->ControlInfo(m_ControllerNumber);
     GetDlgItem(IDC_BTN_SETUP).EnableWindow(false);
     GetDlgItem(IDC_BTN_DEFAULTS).EnableWindow(false);
     GetDlgItem(IDC_BTN_LOAD).EnableWindow(false);
@@ -87,6 +91,8 @@ BOOL CControllerSettings::OnInitDialog(CWindow /*wndFocus*/, LPARAM /*lInitParam
     m_Range.SetRangeMax(100);
     m_Range.SetPos(Controller.Range);
     CWindow(GetDlgItem(IDC_LABEL_RANGE)).SetWindowText(stdstr_f("%d%%", m_Range.GetPos()).ToUTF16().c_str());
+    m_PluggedIn.Attach(GetDlgItem(IDC_CHK_PLUGGED_IN));
+    m_PluggedIn.SetCheck(ControlInfo.Present != 0 ? BST_CHECKED : BST_UNCHECKED);
 
     m_ControllerImg.SubclassWindow(GetDlgItem(IDC_BMP_CONTROLLER));
     m_ControllerImg.SetBitmap(MAKEINTRESOURCE(IDB_CONTROLLER));
@@ -121,7 +127,9 @@ HBRUSH CControllerSettings::OnCtlColorStatic(CDCHandle dc, CWindow wndStatic)
 bool CControllerSettings::OnApply()
 {
     N64CONTROLLER & Controller = g_InputPlugin->Controllers(m_ControllerNumber);
+    CONTROL & ControlInfo = g_InputPlugin->ControlInfo(m_ControllerNumber);
     Controller.Range = (uint8_t)m_Range.GetPos();
+    ControlInfo.Present = (m_PluggedIn.GetCheck() == BST_CHECKED) ? 1 : 0;
     return g_InputPlugin->SaveController(m_ControllerNumber);
 }
 
@@ -135,6 +143,11 @@ LRESULT CControllerSettings::OnScroll(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM l
     return 0;
 }
 
+void CControllerSettings::ItemChanged(UINT /*Code*/, int /*id*/, HWND /*ctl*/)
+{
+    SendMessage(GetParent(), PSM_CHANGED, (WPARAM)m_hWnd, 0);
+}
+
 LRESULT	CControllerSettings::ItemChangedNotify(NMHDR* /*pNMHDR*/)
 {
     SendMessage(GetParent(), PSM_CHANGED, (WPARAM)m_hWnd, 0);