diff --git a/source/client/gui/Screen.cpp b/source/client/gui/Screen.cpp
index 03f2cfa33..5c029da2b 100644
--- a/source/client/gui/Screen.cpp
+++ b/source/client/gui/Screen.cpp
@@ -47,7 +47,7 @@ Screen::Screen()
 	m_bRenderPointer = false;
 	m_lastTimeMoved = 0;
 	m_cursorTick = 0;
-	m_uiTheme = UI_UNIVERSAL;
+	m_uiTheme = UI_GENERIC;
 }
 
 Screen::~Screen()
@@ -140,8 +140,8 @@ void Screen::init(Minecraft* pMinecraft, int width, int height)
 
 	// Apply UI theme to current Screen based on user preference
 	UITheme userTheme = m_pMinecraft->getOptions()->getUiTheme();
-	// We don't bother applying the console theme automatically because this completely fucks scaling
-	if (m_uiTheme == UI_UNIVERSAL && userTheme != UI_CONSOLE)
+	// We don't bother applying the console theme automatically for generic screens because this completely fucks scaling
+	if (m_uiTheme == UI_UNIVERSAL || (m_uiTheme == UI_GENERIC && userTheme != UI_CONSOLE))
 		m_uiTheme = m_pMinecraft->getOptions()->getUiTheme();
 
 	setSize(width, height);
diff --git a/source/client/gui/screens/inventory/ContainerScreen.cpp b/source/client/gui/screens/inventory/ContainerScreen.cpp
index 991e74357..c751f60af 100644
--- a/source/client/gui/screens/inventory/ContainerScreen.cpp
+++ b/source/client/gui/screens/inventory/ContainerScreen.cpp
@@ -13,6 +13,7 @@ ContainerScreen::ContainerScreen(ContainerMenu* menu) :
     m_topPos(0),
     m_timeSlotDragged(0)
 {
+    m_uiTheme = UI_UNIVERSAL;
     m_bRenderPointer = true;
 }
 
diff --git a/source/client/options/Options.hpp b/source/client/options/Options.hpp
index 7b0862d1e..d82d9e9e5 100644
--- a/source/client/options/Options.hpp
+++ b/source/client/options/Options.hpp
@@ -80,7 +80,8 @@ enum UITheme
 	UI_JAVA,
 	UI_CONSOLE,
 
-	UI_UNIVERSAL
+	UI_GENERIC, // The Screen is a Java / Pocket mix
+	UI_UNIVERSAL // The Screen automatically handles all UI themes
 };
 
 enum LogoType