diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp
index 074a1f624c..abc3f4ab96 100644
--- a/plugins/GSdx/GSSettingsDlg.cpp
+++ b/plugins/GSdx/GSSettingsDlg.cpp
@@ -364,6 +364,10 @@ void GSSettingsDlg::UpdateControls()
 		ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE);
 		ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE);
 		ShowWindow(GetDlgItem(m_hWnd, IDC_LOGOGL), ogl ? SW_SHOW : SW_HIDE);
+#ifndef ENABLE_OPENCL
+		ShowWindow(GetDlgItem(m_hWnd, IDC_OPENCL_DEVICE), SW_HIDE);
+		ShowWindow(GetDlgItem(m_hWnd, IDC_OPENCL_TEXT), SW_HIDE);
+#endif
 
 		ShowWindow(GetDlgItem(m_hWnd, IDC_LOGZ), dx9? SW_SHOW: SW_HIDE);
 		ShowWindow(GetDlgItem(m_hWnd, IDC_FBA), dx9 ? SW_SHOW : SW_HIDE);
diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc
index a145dcc47a..39284a8bea 100644
--- a/plugins/GSdx/GSdx.rc
+++ b/plugins/GSdx/GSdx.rc
@@ -206,10 +206,10 @@ BEGIN
     COMBOBOX        IDC_ADAPTER,71,55,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Renderer:",IDC_STATIC,6,72,34,8
     COMBOBOX        IDC_RENDERER,71,70,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "OpenCL Device:",IDC_STATIC,6,87,52,8
-    COMBOBOX        IDC_OPENCL_DEVICE,71,85,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Interlacing (F5):",IDC_STATIC,6,102,53,8
-    COMBOBOX        IDC_INTERLACE,71,100,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "OpenCL Device:",IDC_OPENCL_TEXT,6,102,53,8
+    COMBOBOX        IDC_OPENCL_DEVICE,71,100,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Interlacing (F5):",IDC_STATIC,6,87,52,8
+    COMBOBOX        IDC_INTERLACE,71,85,166,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Hardware Mode Settings",IDC_STATIC,6,116,231,152,BS_CENTER
     CONTROL         "Allow 8-Bit Textures",IDC_PALTEX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,128,90,10
     LTEXT           "Internal Resolution:",IDC_UPSCALE_MULTIPLIER_TEXT,22,144,79,8
diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h
index d5521b0bb7..61affb78ec 100644
--- a/plugins/GSdx/resource.h
+++ b/plugins/GSdx/resource.h
@@ -68,25 +68,26 @@
 #define IDC_AFCOMBO_TEXT                2063
 #define IDC_AFCOMBO                     2064
 #define IDC_OPENCL_DEVICE               2065
-#define IDC_ACCURATE_BLEND_UNIT         2066
-#define IDC_ACCURATE_DATE               2067
-#define IDC_ROUND_SPRITE                2068
-#define IDC_ALIGN_SPRITE                2069
-#define IDC_CRC_LEVEL                   2070
-#define IDC_CRC_LEVEL_TEXT              2071
-#define IDC_TC_DEPTH                    2072
-#define IDC_COLORSPACE                  2073
-#define IDC_SHADER_FX_EDIT              2074
-#define IDC_SHADER_FX_CONF_EDIT         2075
-#define IDC_SHADER_FX_BUTTON            2076
-#define IDC_SHADER_FX_CONF_BUTTON       2077
-#define IDC_SHADER_FX_TEXT              2078
-#define IDC_SHADER_FX_CONF_TEXT         2079
-#define IDC_CUSTOM_TEXT                 2080
-#define IDC_UPSCALE_MULTIPLIER_TEXT     2081
-#define IDC_MIPMAP                      2082
-#define IDC_PRELOAD_GS                  2083
-#define IDC_TVSHADER                    2084
+#define IDC_OPENCL_TEXT                 2066
+#define IDC_ACCURATE_BLEND_UNIT         2067
+#define IDC_ACCURATE_DATE               2068
+#define IDC_ROUND_SPRITE                2069
+#define IDC_ALIGN_SPRITE                2070
+#define IDC_CRC_LEVEL                   2071
+#define IDC_CRC_LEVEL_TEXT              2072
+#define IDC_TC_DEPTH                    2073
+#define IDC_COLORSPACE                  2074
+#define IDC_SHADER_FX_EDIT              2075
+#define IDC_SHADER_FX_CONF_EDIT         2076
+#define IDC_SHADER_FX_BUTTON            2077
+#define IDC_SHADER_FX_CONF_BUTTON       2078
+#define IDC_SHADER_FX_TEXT              2079
+#define IDC_SHADER_FX_CONF_TEXT         2080
+#define IDC_CUSTOM_TEXT                 2081
+#define IDC_UPSCALE_MULTIPLIER_TEXT     2082
+#define IDC_MIPMAP                      2083
+#define IDC_PRELOAD_GS                  2084
+#define IDC_TVSHADER                    2085
 #define IDR_CONVERT_FX                  10000
 #define IDR_TFX_FX                      10001
 #define IDR_MERGE_FX                    10002
@@ -105,7 +106,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        10013
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         2085
+#define _APS_NEXT_CONTROL_VALUE         2086
 #define _APS_NEXT_SYMED_VALUE           5000
 #endif
 #endif