diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp
index 58524cc80..bfa48287e 100644
--- a/src/gui/bouquetlist.cpp
+++ b/src/gui/bouquetlist.cpp
@@ -424,7 +424,7 @@ int CBouquetList::show(bool bShowChannelList)
 			if (!Bouquets.empty()) {
 				int ret = doMenu();
 				if(ret > 0) {
-					CNeutrinoApp::getInstance ()->g_channel_list_changed = true;
+					CNeutrinoApp::getInstance()->MarkChannelListChanged();
 					res = -4;
 					loop = false;
 				} else if(ret < 0)
diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp
index 1130b7907..4e18cead8 100644
--- a/src/gui/channellist.cpp
+++ b/src/gui/channellist.cpp
@@ -710,7 +710,8 @@ int CChannelList::show()
 			old_b_id = bouquetList->getActiveBouquetNumber();
 			fader.Stop();
 			int ret = doChannelMenu();
-			CNeutrinoApp::getInstance()->g_channel_list_changed = (ret != 0);
+			if (ret != 0)
+				CNeutrinoApp::getInstance()->MarkChannelListChanged();
 			if (ret == 1) {
 				res = -3 - ret; /* -5 == add to fav or bouquet, -4 == all other change */
 				loop = false;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 45a0acf2b..7f903f1e4 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -214,7 +214,7 @@ CNeutrinoApp::CNeutrinoApp()
 	lockStandbyCall         = false;
 	current_muted		= 0;
 	recordingstatus		= 0;
-	g_channel_list_changed	= 0;
+	g_channel_list_changed	= false;
 	memset(&font, 0, sizeof(neutrino_font_descr_struct));
 }
 
@@ -2493,7 +2493,7 @@ _repeat:
 				/* don't change bouquet after adding a channel to favorites */
 				if (nNewChannel != -5)
 					SetChannelMode(old_mode);
-				g_channel_list_changed = 0;
+				g_channel_list_changed = false;
 				if(old_b_id < 0) old_b_id = old_b;
 				//g_Zapit->saveBouquets();
 				/* lets do it in sync */
diff --git a/src/neutrino.h b/src/neutrino.h
index c36dd2406..e67b32e40 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -121,6 +121,7 @@ private:
 	bool 				skipSleepTimer;
 	bool                            lockStandbyCall;
 	bool 				pbBlinkChange;
+	bool				g_channel_list_changed;
 	int tvsort[LIST_MODE_LAST];
 	int radiosort[LIST_MODE_LAST];
 
@@ -219,6 +220,7 @@ public:
 		return lastChannelMode;
 	};
 	void SetChannelMode(int mode);
+	void MarkChannelListChanged(void) { g_channel_list_changed = true; };
 	void quickZap(int msg);
 	void numericZap(int msg);
 	void StopSubtitles();
@@ -227,7 +229,6 @@ public:
 	void showInfo(void);
 	CConfigFile* getConfigFile() {return &configfile;};
 	bool 		SDTreloadChannels;
-	bool 		g_channel_list_changed;
 };
 #endif