diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 790c177879..6672a7c16a 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -304,12 +304,14 @@ THREAD_RETURN EmuThread(void *pArg)
 	PADInitialize.pLog = Callback_PADLog;
 	PluginPAD::PAD_Initialize(PADInitialize);
 
-	// Load and Init WiimotePlugin	
-	SWiimoteInitialize WiimoteInitialize;
-	WiimoteInitialize.hWnd = g_pWindowHandle;
-	WiimoteInitialize.pLog = Callback_WiimoteLog;
-	WiimoteInitialize.pWiimoteInput = Callback_WiimoteInput;
-	PluginWiimote::Wiimote_Initialize(WiimoteInitialize);
+	// Load and Init WiimotePlugin - only if we are booting in wii mode	
+	if (_CoreParameter.bWii) {
+		SWiimoteInitialize WiimoteInitialize;
+		WiimoteInitialize.hWnd = g_pWindowHandle;
+		WiimoteInitialize.pLog = Callback_WiimoteLog;
+		WiimoteInitialize.pWiimoteInput = Callback_WiimoteInput;
+		PluginWiimote::Wiimote_Initialize(WiimoteInitialize);
+	}
 
 	// The hardware is initialized.
 	g_bHwInit = true;
@@ -385,8 +387,11 @@ THREAD_RETURN EmuThread(void *pArg)
 
 	PluginPAD::PAD_Shutdown();
 	PluginPAD::UnloadPlugin();
-	PluginWiimote::Wiimote_Shutdown();
-	PluginWiimote::UnloadPlugin();
+	if (_CoreParameter.bWii)
+	{
+		PluginWiimote::Wiimote_Shutdown();
+		PluginWiimote::UnloadPlugin();
+	}
 	PluginDSP::DSP_Shutdown();
 	PluginDSP::UnloadPlugin();
 	PluginVideo::Video_Shutdown();
diff --git a/Source/Core/Core/Src/HW/HW.cpp b/Source/Core/Core/Src/HW/HW.cpp
index 487e276a23..dfc45eee48 100644
--- a/Source/Core/Core/Src/HW/HW.cpp
+++ b/Source/Core/Core/Src/HW/HW.cpp
@@ -64,9 +64,11 @@ namespace HW
 		ExpansionInterface::Init();
 		CCPU::Init();
 		SystemTimers::Init();
-
-        WII_IPC_HLE_Interface::Init();
-        WII_IPCInterface::Init();
+		if (Core::GetStartupParameter().bWii)
+		{
+			WII_IPC_HLE_Interface::Init();
+			WII_IPCInterface::Init();
+		}
 	}
 
 	void Shutdown()
@@ -80,8 +82,11 @@ namespace HW
 		SerialInterface::Shutdown();
 		AudioInterface::Shutdown();
 
-        WII_IPC_HLE_Interface::Shutdown();
-        WII_IPCInterface::Shutdown();
+		if (Core::GetStartupParameter().bWii)
+		{
+			WII_IPC_HLE_Interface::Shutdown();
+			WII_IPCInterface::Shutdown();
+		}
 		
 		State_Shutdown();
 		Thunk_Shutdown();
diff --git a/Source/Core/DolphinWX/Src/BootManager.cpp b/Source/Core/DolphinWX/Src/BootManager.cpp
index 9508971d83..8e9d6ac233 100644
--- a/Source/Core/DolphinWX/Src/BootManager.cpp
+++ b/Source/Core/DolphinWX/Src/BootManager.cpp
@@ -105,7 +105,7 @@ bool BootCore(const std::string& _rFilename)
 		#endif
 	#endif
 
-	if ( !StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT) )
+	if (!StartUp.AutoSetup(SCoreStartupParameter::BOOT_DEFAULT))
 	{
 		return false;
 	}