diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index e88d8a21f..200cdad36 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -744,7 +744,7 @@ void CScanSetup::addScanMenuManualScan(CMenuWidget *manual_Scan)
 	manual_Scan->addItem(GenericMenuSeparatorLine);
 	//----------------------------------------------------------------------
 	shortCut = addScanOptionsItems(manual_Scan, shortCut);
-	addListFlagsItems(manual_Scan, shortCut);
+	addListFlagsItems(manual_Scan, shortCut, true);
 	//----------------------------------------------------------------------
 	manual_Scan->addItem(GenericMenuSeparatorLine);
 
@@ -850,13 +850,18 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
 }
 
 //create list flag items
-int CScanSetup::addListFlagsItems(CMenuWidget *listflags_menu, const int &shortcut)
+int CScanSetup::addListFlagsItems(CMenuWidget *listflags_menu, const int &shortcut, bool manual)
 {	
 	printf("[neutrino] CScanSetup call %s...\n", __FUNCTION__);
 	int shortCut = shortcut;
-	
-	CMenuOptionChooser 	*useNit = new CMenuOptionChooser(LOCALE_SATSETUP_USE_NIT, (int *)&scansettings.scan_mode, OPTIONS_OFF1_ON0_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
-	CMenuOptionChooser	*ftaFlag = new CMenuOptionChooser(LOCALE_SATSETUP_USE_FTA_FLAG, (int *)&scansettings.scan_fta_flag, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF1_ON0_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
+
+	CMenuOptionChooser *useNit;
+	if (manual)
+		useNit = new CMenuOptionChooser(LOCALE_SATSETUP_USE_NIT, (int *)&scansettings.scan_nit_manual, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
+	else
+		useNit = new CMenuOptionChooser(LOCALE_SATSETUP_USE_NIT, (int *)&scansettings.scan_nit, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
+
+	CMenuOptionChooser	*ftaFlag = new CMenuOptionChooser(LOCALE_SATSETUP_USE_FTA_FLAG, (int *)&scansettings.scan_fta_flag, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
 	CMenuOptionChooser	*scanPid = new CMenuOptionChooser(LOCALE_EXTRA_ZAPIT_SCANPIDS,  &zapitCfg.scanPids, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
 
 	listflags_menu->addItem(useNit);
diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h
index 18821d841..439595b48 100644
--- a/src/gui/scan_setup.h
+++ b/src/gui/scan_setup.h
@@ -101,7 +101,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
  		void addScanMenuAutoScan(CMenuWidget *auto_Scan);
 
 		int addScanOptionsItems(CMenuWidget *options_menu, const int &shortcut = 1);
-		int addListFlagsItems(CMenuWidget *listflags_menu, const int &shortcut = 1);
+		int addListFlagsItems(CMenuWidget *listflags_menu, const int &shortcut = 1, bool manual = false);
 
 		void saveScanSetup();