diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp
index 9845e13e5..cf2f0268d 100644
--- a/uppsrc/CtrlCore/Ctrl.cpp
+++ b/uppsrc/CtrlCore/Ctrl.cpp
@@ -955,9 +955,6 @@ void Ctrl::ReSkin()
 	if(lock)
 		return;
 	lock++;
-	bool uhd = GetStdFontCy() > 22;
-	GUI_HiDPI_Write(GetStdFontCy() > 22);
-	SetUHDMode(uhd);
 	if(s_chdefault)
 		(*s_chdefault)();
 	if(skin)
@@ -983,7 +980,6 @@ CH_INT(GUI_AKD_Conservative, 0);
 CH_INT(GUI_DragDistance, 4);
 CH_INT(GUI_DblClickTime, 500);
 CH_INT(GUI_WheelScrollLines, 3);
-CH_INT(GUI_HiDPI, 0);
 
 String Ctrl::Name0() const {
 	GuiLock __;
diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index 334652c52..57296f0a5 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -1309,8 +1309,6 @@ int GUI_DragDistance();
 int GUI_DblClickTime();
 int GUI_WheelScrollLines();
 
-int GUI_HiDPI();
-
 void GUI_GlobalStyle_Write(int);
 void GUI_DragFullWindow_Write(int);
 void GUI_PopUpEffect_Write(int);
diff --git a/uppsrc/Draw/Font.cpp b/uppsrc/Draw/Font.cpp
index fae6e47a5..7bf400963 100644
--- a/uppsrc/Draw/Font.cpp
+++ b/uppsrc/Draw/Font.cpp
@@ -118,6 +118,7 @@ void Font::SyncStdFont()
 {
 	Mutex::Lock __(sFontLock);
 	StdFontSize = Size(AStdFont.GetAveWidth(), AStdFont().Bold().GetCy());
+	SyncUHDMode();
 }
 
 void (*whenSetStdFont)();
diff --git a/uppsrc/Draw/ImageOp.h b/uppsrc/Draw/ImageOp.h
index e9bfd962c..84efece30 100644
--- a/uppsrc/Draw/ImageOp.h
+++ b/uppsrc/Draw/ImageOp.h
@@ -202,6 +202,7 @@ Image RescaleBicubic(const Image& img, int cx, int cy, Gate2<int, int> progress
 
 void SetUHDMode(bool b = true);
 bool IsUHDMode();
+void SyncUHDMode();
 
 Image DPI(const Image& m);
 Image DPI(const Image& img, int expected);
diff --git a/uppsrc/Draw/Uhd.cpp b/uppsrc/Draw/Uhd.cpp
index df0389145..be96653a2 100644
--- a/uppsrc/Draw/Uhd.cpp
+++ b/uppsrc/Draw/Uhd.cpp
@@ -101,6 +101,13 @@ bool IsUHDMode()
 	return sUHDMode;
 }
 
+void SyncUHDMode()
+{
+	bool uhd = GetStdFontCy() > 22;
+	if(uhd != IsUHDMode())
+		SetUHDMode(uhd);
+}
+
 Image DPI(const Image& img)
 {
 	if(IsUHDMode()) {