diff --git a/Library/Library.rc b/Library/Library.rc
index 4957e1ff..3d1c6783 100644
--- a/Library/Library.rc
+++ b/Library/Library.rc
@@ -111,7 +111,7 @@ IDR_SKIN_MENU MENU
 BEGIN
     POPUP "Skin"
     BEGIN
-        MENUITEM "",                           ID_CONTEXT_SKINMENU_OPENSKINSFOLDER
+        MENUITEM " ",                           ID_CONTEXT_SKINMENU_OPENSKINSFOLDER  // Avoid to be compiled as a separator
         MENUITEM SEPARATOR
         POPUP "Variants"
         BEGIN
diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp
index 46e1ad92..f1d7f191 100644
--- a/Library/Rainmeter.cpp
+++ b/Library/Rainmeter.cpp
@@ -3794,7 +3794,11 @@ void CRainmeter::ShowContextMenu(POINT pos, CMeterWindow* meterWindow)
 				HMENU themeMenu = GetSubMenu(subMenu, 5);
 				if (themeMenu)
 				{
-					CreateThemeMenu(themeMenu);
+					if (!m_Themes.empty())
+					{
+						DeleteMenu(themeMenu, 0, MF_BYPOSITION);
+						CreateThemeMenu(themeMenu);
+					}
 				}
 
 				if (meterWindow)
@@ -3924,8 +3928,6 @@ void CRainmeter::CreateThemeMenu(HMENU themeMenu)
 {
 	if (!m_Themes.empty())
 	{
-		InsertMenu(themeMenu, 0, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
-
 		for (size_t i = 0, isize = m_Themes.size(); i < isize; ++i)
 		{
 			InsertMenu(themeMenu, i, MF_BYPOSITION, ID_THEME_FIRST + i, m_Themes[i].c_str());