Index: gtk2_ardour/ardour_ui.cc
===================================================================
--- gtk2_ardour/ardour_ui.cc	(revision 3486)
+++ gtk2_ardour/ardour_ui.cc	(working copy)
@@ -3326,9 +3326,22 @@
 void
 ARDOUR_UI::setup_profile ()
 {
+#ifndef GTKOSX
 	if (gdk_screen_width() < 1200) {
+		cerr << "gdk_screen_width() = " << gdk_screen_width() <<  ", font_scale = " << (Config->get_font_scale() / 1024) << endl;
+		if (Config->get_font_scale() / 1024 > 72) {
+			Config->set_font_scale(1024 * 72);
+			cerr << "font_scale now set to " << (Config->get_font_scale() / 1024) << endl;
+		}
+		if (gdk_screen_width() < 1024) {
+			Profile->set_small_screen ();
+		}
+	}
+#else 
+	if (gdk_screen_width() < 1200) {
 		Profile->set_small_screen ();
 	}
+#endif
 
 	if (getenv ("ARDOUR_SAE")) {
 		Profile->set_sae ();