diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp
index 16131a921..fe0ad5f6b 100644
--- a/src/gui/themes.cpp
+++ b/src/gui/themes.cpp
@@ -84,6 +84,7 @@ int CThemes::exec(CMenuTarget* parent, const std::string & actionKey)
 			} 
 			else
 				readFile(((std::string)THEMESDIR + "/" + themeFile + FILE_PREFIX).c_str());
+			g_settings.theme_name = themeFile;
 		}
 		return res;
 	}
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 2f77b42f5..96e55e7d1 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -350,6 +350,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	//theme/color options
 	CThemes::getTheme(configfile);
+	g_settings.theme_name = configfile.getString("theme_name","");
 
 	g_settings.softupdate_autocheck = configfile.getBool("softupdate_autocheck" , false);
 
@@ -1122,6 +1123,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	}
 
 	//theme/color options
+	configfile.getString( "theme_name",g_settings.theme_name );
 	CThemes::setTheme(configfile);
 
 	//video
diff --git a/src/system/settings.h b/src/system/settings.h
index de8c7dd98..a43a09727 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -452,6 +452,7 @@ struct SNeutrinoSettings
 
 	//theme/color options
 	SNeutrinoTheme theme;
+	std::string theme_name;
 	bool osd_colorsettings_advanced_mode;
 
 	//network