diff --git a/src/Application.vala b/src/Application.vala
index ffd871b0..c65b7bf9 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -82,18 +82,22 @@ public class Wingpanel.Application : Gtk.Application {
             IndicatorManager.get_default ().initialize (IndicatorManager.ServerType.GREETER);
         } else {
             IndicatorManager.get_default ().initialize (IndicatorManager.ServerType.SESSION);
+        }
 
-            var granite_settings = Granite.Settings.get_default ();
-            var gtk_settings = Gtk.Settings.get_default ();
-            gtk_settings.gtk_icon_theme_name = "elementary";
-
-            gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
+        var granite_settings = Granite.Settings.get_default ();
+        var gtk_settings = Gtk.Settings.get_default ();
+        gtk_settings.gtk_icon_theme_name = "elementary";
 
-            granite_settings.notify["prefers-color-scheme"].connect (() => {
-                gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
-            });
+        if (!gtk_settings.gtk_theme_name.has_prefix ("io.elementary")) {
+            gtk_settings.gtk_theme_name = "io.elementary.stylesheet.blueberry";
         }
 
+        gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
+
+        granite_settings.notify["prefers-color-scheme"].connect (() => {
+            gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
+        });
+
         if (options.contains (OPEN_INDICATOR_ACTION_NAME)) {
             activate_action (OPEN_INDICATOR_ACTION_NAME, options.lookup_value (OPEN_INDICATOR_ACTION_NAME, VariantType.STRING));
         }