diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp
index a625170f73..7ba1d7140e 100644
--- a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp
@@ -170,8 +170,15 @@ void ConfigDialog::CloseClick(wxCommandEvent& event)
 	switch(event.GetId())
 	{
 	case ID_CLOSE:
-		WiiMoteReal::g_Shutdown = true;
-		m_ShutDownTimer->Start(10);
+		if(!g_EmulatorRunning)
+		{
+			WiiMoteReal::g_Shutdown = true;
+			m_ShutDownTimer->Start(10);
+		}
+		else
+		{
+			Close();
+		}
 		break;
 	case ID_APPLY:
 		SaveFile();