diff --git a/Common/Common.h b/Common/Common.h
index 7e67c37f72..86db93e116 100644
--- a/Common/Common.h
+++ b/Common/Common.h
@@ -120,7 +120,9 @@ private:
 #define __chdir chdir
 #endif
 
-#if defined __GNUC__
+#if !defined(__GNUC__) && (defined(_M_X64) || defined(_M_IX86))
+# define _M_SSE 0x402
+#else
 # if defined __SSE4_2__
 #  define _M_SSE 0x402
 # elif defined __SSE4_1__
@@ -132,8 +134,6 @@ private:
 # elif defined __SSE2__
 #  define _M_SSE 0x200
 # endif
-#elif ((_MSC_VER >= 1500) || __INTEL_COMPILER) && !defined(_XBOX) // Visual Studio 2008
-# define _M_SSE 0x402
 #endif
 
 #include "Swap.h"
diff --git a/GPU/Common/VertexDecoderCommon.cpp b/GPU/Common/VertexDecoderCommon.cpp
index a4f7b3289f..101e3295b0 100644
--- a/GPU/Common/VertexDecoderCommon.cpp
+++ b/GPU/Common/VertexDecoderCommon.cpp
@@ -1173,18 +1173,16 @@ VertexDecoderJitCache::VertexDecoderJitCache()
 	AllocCodeSpace(1024 * 64 * 4);
 
 	// Add some random code to "help" MSVC's buggy disassembler :(
-#if defined(_WIN32)
+#if defined(_WIN32) && (defined(_M_IX86) || defined(_M_X64))
 	using namespace Gen;
 	for (int i = 0; i < 100; i++) {
 		MOV(32, R(EAX), R(EBX));
 		RET();
 	}
-#else
-#ifdef ARM
+#elif defined(ARM)
 	BKPT(0);
 	BKPT(0);
 #endif
-#endif
 }
 
 void VertexDecoderJitCache::Clear() {