diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp
index 61ee07896..a58a5afe8 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 f6574ad21..2803d8a91 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -364,6 +364,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
 
 	//theme/color options
 	CThemes::getTheme(configfile);
+	g_settings.theme_name = configfile.getString("theme_name","");
 
 	//NI
 	g_settings.inetradio_autostart = configfile.getInt32("inetradio_autostart" , 0);
@@ -1233,6 +1234,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
 	}
 
 	//theme/color options
+	configfile.getString( "theme_name",g_settings.theme_name );
 	CThemes::setTheme(configfile);
 
 	//NI
diff --git a/src/system/settings.h b/src/system/settings.h
index bbceeb71a..44ad89560 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -461,6 +461,7 @@ struct SNeutrinoSettings
 
 	//theme/color options
 	SNeutrinoTheme theme;
+	std::string theme_name;
 	bool osd_colorsettings_advanced_mode;
 
 	//network