diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale
index e63352587..8acb1944d 100644
--- a/data/locale/deutsch.locale
+++ b/data/locale/deutsch.locale
@@ -2395,6 +2395,11 @@ plugintype.game Spiel
 plugintype.lua Lua-Plugin
 plugintype.script Skript
 plugintype.tool Werkzeug
+quadpip QuadPiP
+quadpip_1 Programm 1
+quadpip_2 Programm 2
+quadpip_3 Programm 3
+quadpip_4 Programm 4
 rclock.locked Gesperrt
 rclock.lockmsg Die Fernbedienung wird gesperrt.\nUm die Sperre aufzuheben, bitte\n[rot] gefolgt von [%s]\nauf der Fernbedienung drücken.
 rclock.title Fernbedienung sperren
diff --git a/data/locale/english.locale b/data/locale/english.locale
index 7405c523d..3a4178e6d 100644
--- a/data/locale/english.locale
+++ b/data/locale/english.locale
@@ -2395,6 +2395,11 @@ plugintype.game Game
 plugintype.lua Lua plugin
 plugintype.script Script
 plugintype.tool Tool
+quadpip QuadPiP
+quadpip_1 Channel 1
+quadpip_2 Channel 2
+quadpip_3 Channel 3
+quadpip_4 Channel 4
 rclock.locked Locked
 rclock.lockmsg Remote control will be locked.\nTo unlock, press\n[red] followed by [%s]\non your remote control.
 rclock.title Lock remote control
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index cb4b2e9a5..c1aeb9b6f 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -116,6 +116,9 @@
 #ifdef ENABLE_PIP
 #include "gui/pipsetup.h"
 #endif
+#if ENABLE_PIP && ENABLE_QUADPIP
+#include <gui/quadpip_setup.h>
+#endif
 #include "gui/themes.h"
 #include "gui/timerlist.h"
 #include "gui/components/cc_item_progressbar.h"
@@ -1165,6 +1168,15 @@ int CNeutrinoApp::loadSetup(const char *fname)
 	g_settings.pip_radio_height = configfile.getInt32("pip_radio_height", g_settings.pip_height);
 #endif
 
+#if ENABLE_PIP && ENABLE_QUADPIP
+	for (unsigned int i = 0; i < 4; i++) {
+		sprintf(cfg_key, "quadpip_channel_window_%d", i);
+		g_settings.quadpip_channel_window[i] = configfile.getString(cfg_key, "-");
+		sprintf(cfg_key, "quadpip_channel_id_window_%d", i);
+		g_settings.quadpip_channel_id_window[i] = configfile.getInt32(cfg_key, 0);
+	}
+#endif
+
 	// pictureviewer
 	g_settings.picviewer_scaling = configfile.getInt32("picviewer_scaling", 1 /*(int)CPictureViewer::SIMPLE*/);
 	g_settings.picviewer_slide_time = configfile.getInt32("picviewer_slide_time", 10);
@@ -2124,6 +2136,15 @@ void CNeutrinoApp::saveSetup(const char *fname)
 	configfile.setInt32("pip_radio_height", g_settings.pip_radio_height);
 #endif
 
+#if ENABLE_PIP && ENABLE_QUADPIP
+	for (unsigned int i = 0; i < 4; i++) {
+		std::string qp = "quadpip_channel_window_" + to_string(i);
+		configfile.setString(qp, g_settings.quadpip_channel_window[i]);
+		qp = "quadpip_channel_id_window_" + to_string(i);
+		configfile.setInt32(qp, g_settings.quadpip_channel_id_window[i]);
+	}
+#endif
+
 	// pictureviewer
 	configfile.setInt32("picviewer_scaling", g_settings.picviewer_scaling);
 	configfile.setInt32("picviewer_slide_time", g_settings.picviewer_slide_time);
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index aaba52aeb..576425d0a 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -68,7 +68,10 @@
 #include "gui/sleeptimer.h"
 #include "gui/timerlist.h"
 #include "gui/update_menue.h"
-#if ENABLE_TESTING
+#if ENABLE_PIP && ENABLE_QUADPIP
+#include <gui/quadpip_setup.h>
+#endif
+#ifdef ENABLE_TESTING
 #include "gui/test_menu.h"
 #endif
 #include "gui/update.h"
@@ -269,7 +272,12 @@ void CNeutrinoApp::InitMenuMain()
 		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]);
 	}
 
-#if ENABLE_TESTING
+#if ENABLE_PIP && ENABLE_QUADPIP
+	CMenuForwarder *quadpip = new CMenuForwarder(LOCALE_QUADPIP, true, NULL, new CQuadPiPSetup(), NULL, CRCInput::RC_nokey);
+	personalize.addItem(MENU_MAIN, quadpip/*, &g_settings.personalize[SNeutrinoSettings::P_MAIN_QUADPIP]*/);
+#endif
+
+#ifdef ENABLE_TESTING
 	personalize.addItem(MENU_MAIN, new CMenuForwarder("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
 #endif
 }
diff --git a/src/system/locals.h b/src/system/locals.h
index d4966e192..f9e3c3577 100644
--- a/src/system/locals.h
+++ b/src/system/locals.h
@@ -2422,6 +2422,11 @@ typedef enum
 	LOCALE_PLUGINTYPE_LUA,
 	LOCALE_PLUGINTYPE_SCRIPT,
 	LOCALE_PLUGINTYPE_TOOL,
+	LOCALE_QUADPIP,
+	LOCALE_QUADPIP_1,
+	LOCALE_QUADPIP_2,
+	LOCALE_QUADPIP_3,
+	LOCALE_QUADPIP_4,
 	LOCALE_RCLOCK_LOCKED,
 	LOCALE_RCLOCK_LOCKMSG,
 	LOCALE_RCLOCK_TITLE,
diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h
index ece7329cd..2fb93592a 100644
--- a/src/system/locals_intern.h
+++ b/src/system/locals_intern.h
@@ -2422,6 +2422,11 @@ const char * locale_real_names[] =
 	"plugintype.lua",
 	"plugintype.script",
 	"plugintype.tool",
+	"quadpip",
+	"quadpip_1",
+	"quadpip_2",
+	"quadpip_3",
+	"quadpip_4",
 	"rclock.locked",
 	"rclock.lockmsg",
 	"rclock.title",
diff --git a/src/system/settings.h b/src/system/settings.h
index 5a771b33c..f10b03090 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -951,6 +951,11 @@ struct SNeutrinoSettings
 	int pip_radio_y;
 #endif
 
+#if ENABLE_PIP && ENABLE_QUADPIP
+	std::string quadpip_channel_window[4];
+	int quadpip_channel_id_window[4];
+#endif
+
 	// pictureviewer
 	int picviewer_scaling;
 	int picviewer_slide_time;