diff --git a/plugins/GSdx/GSLinuxDialog.cpp b/plugins/GSdx/GSLinuxDialog.cpp
index 93100d92b7..a1a1e9d39e 100644
--- a/plugins/GSdx/GSLinuxDialog.cpp
+++ b/plugins/GSdx/GSLinuxDialog.cpp
@@ -362,6 +362,9 @@ void populate_shader_table(GtkWidget* shader_table)
 	GtkWidget* fxaa_check       = CreateCheckBox("Fxaa shader", "fxaa");
 	GtkWidget* shaderfx_check   = CreateCheckBox("External shader", "shaderfx");
 
+	GtkWidget* tv_shader_label  = gtk_label_new("TV shader:");
+	GtkWidget* tv_shader        = CreateComboBoxFromVector(theApp.m_gs_tv_shaders, "TVShader");
+
 	// Shadeboost scale
 	GtkWidget* sb_brightness       = CreateScale("ShadeBoost_Brightness", 50);
 	GtkWidget* sb_brightness_label = gtk_label_new("Shade Boost Brightness");
@@ -385,6 +388,7 @@ void populate_shader_table(GtkWidget* shader_table)
 	InsertWidgetInTable(shader_table , shaderfx_check);
 	InsertWidgetInTable(shader_table , shader_label        , shader);
 	InsertWidgetInTable(shader_table , shader_conf_label   , shader_conf);
+	InsertWidgetInTable(shader_table , tv_shader_label, tv_shader);
 }
 
 void populate_hack_table(GtkWidget* hack_table)
diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp
index c311e17696..f5603b6d98 100644
--- a/plugins/GSdx/GSdx.cpp
+++ b/plugins/GSdx/GSdx.cpp
@@ -196,6 +196,12 @@ GSdxApp::GSdxApp()
 	m_gs_acc_blend_level.push_back(GSSetting(4, "Full", "Very Slow"));
 	m_gs_acc_blend_level.push_back(GSSetting(5, "Ultra", "Ultra Slow"));
 
+	m_gs_tv_shaders.push_back(GSSetting(0, "None", ""));
+	m_gs_tv_shaders.push_back(GSSetting(1, "Scanline filter", ""));
+	m_gs_tv_shaders.push_back(GSSetting(2, "Diagonal filter", ""));
+	m_gs_tv_shaders.push_back(GSSetting(3, "Triangular filter", ""));
+	m_gs_tv_shaders.push_back(GSSetting(4, "Wave filter", ""));
+
 	m_gpu_renderers.push_back(GSSetting(0, "Direct3D9 (Software)", ""));
 	m_gpu_renderers.push_back(GSSetting(1, "Direct3D11 (Software)", ""));
 	m_gpu_renderers.push_back(GSSetting(2, "SDL 1.3 (Software)", ""));
diff --git a/plugins/GSdx/GSdx.h b/plugins/GSdx/GSdx.h
index 08bb3ec645..e9731ea618 100644
--- a/plugins/GSdx/GSdx.h
+++ b/plugins/GSdx/GSdx.h
@@ -68,6 +68,7 @@ public:
 	vector<GSSetting> m_gs_hack;
 	vector<GSSetting> m_gs_crc_level;
 	vector<GSSetting> m_gs_acc_blend_level;
+	vector<GSSetting> m_gs_tv_shaders;
 
 	vector<GSSetting> m_gpu_renderers;
 	vector<GSSetting> m_gpu_filter;