diff --git a/data/Dockerfiles/sogo/bootstrap-sogo.sh b/data/Dockerfiles/sogo/bootstrap-sogo.sh
index b0dfc21f..7601f5b5 100755
--- a/data/Dockerfiles/sogo/bootstrap-sogo.sh
+++ b/data/Dockerfiles/sogo/bootstrap-sogo.sh
@@ -153,4 +153,7 @@ echo '    </dict>
 chown sogo:sogo -R /var/lib/sogo/
 chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist
 
+# Inject md-theme to hopefully fix theme swtiching
+sed -i 's/<main class/<main md-theme="mailcow" class/g' /usr/lib/GNUstep/SOGo/Templates/MainUI/SOGoRootPage.wox
+
 exec gosu sogo /usr/sbin/sogod
diff --git a/data/Dockerfiles/sogo/theme-blue.js b/data/Dockerfiles/sogo/theme-blue.js
index 332f3b58..00ded160 100644
--- a/data/Dockerfiles/sogo/theme-blue.js
+++ b/data/Dockerfiles/sogo/theme-blue.js
@@ -120,5 +120,6 @@
 
     $mdThemingProvider.setDefaultTheme('mailcow');
     $mdThemingProvider.generateThemesOnDemand(false);
+    $mdThemingProvider.alwaysWatchTheme(true);
   }
 })();
diff --git a/data/Dockerfiles/sogo/theme-green.js b/data/Dockerfiles/sogo/theme-green.js
index 35a6f788..a14dd1a2 100644
--- a/data/Dockerfiles/sogo/theme-green.js
+++ b/data/Dockerfiles/sogo/theme-green.js
@@ -57,5 +57,6 @@
 
     $mdThemingProvider.setDefaultTheme('mailcow');
     $mdThemingProvider.generateThemesOnDemand(false);
+    $mdThemingProvider.alwaysWatchTheme(true);
   }
 })();