diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index bc2cebfd0..a01db0d91 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -72,6 +72,9 @@ extern cVideo *videoDecoder;
 extern cVideo *pipVideoDecoder[3];
 #include <gui/pipsetup.h>
 #endif
+#if ENABLE_QUADPIP
+#include <gui/quadpip_setup.h>
+#endif
 extern int prev_video_mode;
 extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
 
@@ -535,6 +538,12 @@ int CVideoSettings::showVideoSetup()
 	videosetup->addItem(pipsetup);
 #endif
 
+#if ENABLE_QUADPIP
+	CMenuForwarder *quadpip = new CMenuForwarder(LOCALE_QUADPIP, g_info.hw_caps->pip_devs >= 1, NULL, new CQuadPiPSetup());
+	quadpip->setHint(NEUTRINO_ICON_HINT_QUADPIP, LOCALE_MENU_HINT_QUADPIP);
+	videosetup->addItem(quadpip);
+#endif
+
 	if (file_exists("/proc/stb/video/zapmode")) {
 		CMenuOptionChooser * zm = new CMenuOptionChooser(LOCALE_VIDEOMENU_ZAPPINGMODE, &g_settings.zappingmode, VIDEOMENU_ZAPPINGMODE_OPTIONS, VIDEOMENU_ZAPPINGMODE_OPTION_COUNT, true, this);
 		zm->setHint("", LOCALE_MENU_HINT_VIDEO_ZAPPINGMODE);
diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp
index d95316ebf..1db765fc8 100644
--- a/src/neutrino_menue.cpp
+++ b/src/neutrino_menue.cpp
@@ -68,9 +68,6 @@
 #include "gui/sleeptimer.h"
 #include "gui/timerlist.h"
 #include "gui/update_menue.h"
-#if ENABLE_QUADPIP
-#include <gui/quadpip_setup.h>
-#endif
 #ifdef ENABLE_TESTING
 #include "gui/test_menu.h"
 #endif
@@ -272,15 +269,6 @@ void CNeutrinoApp::InitMenuMain()
 		personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]);
 	}
 
-#if ENABLE_QUADPIP
-	// temp, only for testing, changed later
-	if (g_info.hw_caps->pip_devs >= 1) {
-		CMenuForwarder *quadpip = new CMenuForwarder(LOCALE_QUADPIP, true, NULL, new CQuadPiPSetup(), NULL, CRCInput::RC_nokey);
-		quadpip->setHint(NEUTRINO_ICON_HINT_QUADPIP, LOCALE_MENU_HINT_QUADPIP);
-		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