diff --git a/Data/User/OpenCL/TextureDecoder.cl b/Data/Sys/OpenCL/TextureDecoder.cl
similarity index 100%
rename from Data/User/OpenCL/TextureDecoder.cl
rename to Data/Sys/OpenCL/TextureDecoder.cl
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index eac7be46b3..3965943b89 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -256,8 +256,6 @@ bool DolphinApp::OnInit()
 	// TODO: replace these with overlays
 	File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP),
 			File::GetUserPath(D_GAMECONFIG_IDX));
-	File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP),
-			File::GetUserPath(D_OPENCL_IDX));
 
 	File::CreateFullPath(File::GetUserPath(D_USER_IDX));
 	File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
@@ -271,6 +269,7 @@ bool DolphinApp::OnInit()
 	File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
 	File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
 	File::CreateFullPath(File::GetUserPath(D_MAPS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_OPENCL_IDX));
 	File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
 	File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX));
 	File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
index a9c6977d42..211244c457 100644
--- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
@@ -5,6 +5,7 @@
 #include "OCLTextureDecoder.h"
 
 #include "../OpenCL.h"
+#include "CommonPaths.h"
 #include "FileUtil.h"
 
 #include <fcntl.h>
@@ -138,7 +139,7 @@ void TexDecoder_OpenCL_Initialize()
 		if (err)
 		{
 			std::string code;
-			filename = File::GetUserPath(D_OPENCL_IDX) + "TextureDecoder.cl";
+			filename = File::GetSysDirectory() + OPENCL_DIR DIR_SEP "TextureDecoder.cl";
 			if (!File::ReadFileToString(true, filename.c_str(), code))
 			{
 				ERROR_LOG(VIDEO, "Failed to load OpenCL code %s - file is missing?", filename.c_str());