diff --git a/uppsrc/CtrlCore/DrawX11.cpp b/uppsrc/CtrlCore/DrawX11.cpp
index 5f9bdefa1..ac78ebf6c 100644
--- a/uppsrc/CtrlCore/DrawX11.cpp
+++ b/uppsrc/CtrlCore/DrawX11.cpp
@@ -215,8 +215,6 @@ void InitX11Draw(XDisplay *display)
 		Xgetpixel = GetPseudoColorPixel;
 	}
 //	XFree(v);
-
-	Font::SetStdFont(ScreenSans(12));
 }
 
 void InitX11Draw(const char *dispname)
diff --git a/uppsrc/CtrlCore/X11App.cpp b/uppsrc/CtrlCore/X11App.cpp
index d048c684d..0ca34bcf0 100644
--- a/uppsrc/CtrlCore/X11App.cpp
+++ b/uppsrc/CtrlCore/X11App.cpp
@@ -419,7 +419,7 @@ void Ctrl::InitX11(const char *display)
 	for(int i = 0; i < nets.GetCount(); i++)
 		_NET_Supported().Add(nets[i]);
 
-	SetStdFont(Arial(12));
+	Font::SetDefaultFont(Arial(12));
 
 	ReSkin();
 
diff --git a/uppsrc/CtrlLib/ChGtk.cpp b/uppsrc/CtrlLib/ChGtk.cpp
index 0d6c01be1..5354700e0 100644
--- a/uppsrc/CtrlLib/ChGtk.cpp
+++ b/uppsrc/CtrlLib/ChGtk.cpp
@@ -111,7 +111,7 @@ void ChHostSkin()
 //	gtk_hintstyle = GtkStyleString("gtk-xft-hintstyle");
 	gtk_hintstyle = gtk_hinting? "hintfull" : "hintnone"; // Gtk does not seem to follow its own rules...
 	gtk_rgba = GtkStyleString("gtk-xft-rgba");
-
+	
 	const char *q = strrchr(font_name, ' ');
 	if(q) {
 		int h = atoi(q);
@@ -149,7 +149,7 @@ void ChHostSkin()
 			}
 		}
 	}
-
+	
 	Font::SetDefaultFont(Font(fontname, fround(fontheight * xdpi + 512*72.0) / (1024*72))
 	                     .Bold(bold).Italic(italic));
 
diff --git a/uppsrc/Draw/Font.cpp b/uppsrc/Draw/Font.cpp
index 7bf400963..9515c505b 100644
--- a/uppsrc/Draw/Font.cpp
+++ b/uppsrc/Draw/Font.cpp
@@ -152,6 +152,7 @@ bool Font::std_font_override;
 
 void Font::SetDefaultFont(Font font)
 {
+	LLOG("SetDefaultFont " << font);
 	if(!std_font_override)
 		SetStdFont0(font);
 }