diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 1963587a2bd..546827ee1d2 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -216,6 +216,7 @@ FlatSideBarIcons=true
 FlatProjectsMode=true
 FlatMenuBar=true
 ToolBarIconShadow=true
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=0
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index da10636a8f5..ceb0f39f439 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -187,6 +187,7 @@ FlatSideBarIcons=false
 FlatProjectsMode=false
 FlatMenuBar=false
 ToolBarIconShadow=true
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=ffffff
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index 820b7fa8877..d2e194dd3f6 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -221,6 +221,7 @@ FlatSideBarIcons=true
 FlatProjectsMode=true
 FlatMenuBar=true
 ToolBarIconShadow=true
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=0
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index 6c8d65440ad..f801f9eaa5b 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -198,6 +198,7 @@ FlatSideBarIcons=true
 FlatProjectsMode=false
 FlatMenuBar=false
 ToolBarIconShadow=false
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=0
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index 2f49efef577..285bc9c99ce 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -197,6 +197,7 @@ FlatSideBarIcons=true
 FlatProjectsMode=false
 FlatMenuBar=false
 ToolBarIconShadow=true
+WindowColorAsBase=false
 
 [Gradients]
 DetailsWidgetHeaderGradient\1\color=0
diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp
index 1dfe1d89ddc..78d20c55db5 100644
--- a/src/libs/utils/stylehelper.cpp
+++ b/src/libs/utils/stylehelper.cpp
@@ -114,6 +114,12 @@ QColor StyleHelper::m_requestedBaseColor;
 
 QColor StyleHelper::baseColor(bool lightColored)
 {
+    static const bool windowColorAsBase = creatorTheme()->flag(Theme::WindowColorAsBase);
+    if (windowColorAsBase) {
+        static const QColor windowColor = QApplication::palette().color(QPalette::Window);
+        return windowColor;
+    }
+
     if (!lightColored)
         return m_baseColor;
     else
diff --git a/src/libs/utils/theme/theme.h b/src/libs/utils/theme/theme.h
index a32e7b05533..dd2eac9a0d2 100644
--- a/src/libs/utils/theme/theme.h
+++ b/src/libs/utils/theme/theme.h
@@ -326,7 +326,8 @@ public:
         FlatSideBarIcons,
         FlatProjectsMode,
         FlatMenuBar,
-        ToolBarIconShadow
+        ToolBarIconShadow,
+        WindowColorAsBase
     };
 
     bool flag(Flag f) const;