diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
index 2e4997e8a1..56e93cdafe 100644
--- a/clients/aurorae/src/aurorae.cpp
+++ b/clients/aurorae/src/aurorae.cpp
@@ -570,13 +570,13 @@ int AuroraeClient::layoutMetric(LayoutMetric lm, bool respectWindowState,
         return conf.paddingBottom();
 
     case LM_TitleEdgeLeft:
-        return conf.titleEdgeLeft();
+        return maximized && respectWindowState ? conf.titleEdgeLeftMaximized() : conf.titleEdgeLeft();
     case LM_TitleEdgeRight:
-        return conf.titleBorderRight();
+        return maximized && respectWindowState ? conf.titleEdgeRightMaximized() : conf.titleBorderRight();
     case LM_TitleEdgeTop:
-        return conf.titleEdgeTop();
+        return maximized && respectWindowState ? conf.titleEdgeTopMaximized() : conf.titleEdgeTop();
     case LM_TitleEdgeBottom:
-        return conf.titleEdgeBottom();
+        return maximized && respectWindowState ? conf.titleEdgeBottomMaximized() : conf.titleEdgeBottom();
 
     case LM_ButtonMarginTop:
         return conf.buttonMarginTop();
diff --git a/clients/aurorae/src/themeconfig.cpp b/clients/aurorae/src/themeconfig.cpp
index 872f3320e6..c296c06498 100644
--- a/clients/aurorae/src/themeconfig.cpp
+++ b/clients/aurorae/src/themeconfig.cpp
@@ -71,6 +71,10 @@ void ThemeConfig::load(KConfig *conf)
     m_titleEdgeBottom = border.readEntry("TitleEdgeBottom", 5);
     m_titleEdgeLeft = border.readEntry("TitleEdgeLeft", 5);
     m_titleEdgeRight = border.readEntry("TitleEdgeRight", 5);
+    m_titleEdgeTopMaximized = border.readEntry("TitleEdgeTopMaximized", m_titleEdgeTop);
+    m_titleEdgeBottomMaximized = border.readEntry("TitleEdgeBottomMaximized", m_titleEdgeBottom);
+    m_titleEdgeLeftMaximized = border.readEntry("TitleEdgeLeftMaximized", m_titleEdgeLeft);
+    m_titleEdgeRightMaximized = border.readEntry("TitleEdgeRightMaximized", m_titleEdgeRight);
     m_titleBorderLeft = border.readEntry("TitleBorderLeft", 5);
     m_titleBorderRight = border.readEntry("TitleBorderRight", 5);
     m_titleHeight = border.readEntry("TitleHeight", 20);
diff --git a/clients/aurorae/src/themeconfig.h b/clients/aurorae/src/themeconfig.h
index 2cbc706af2..de56b6387a 100644
--- a/clients/aurorae/src/themeconfig.h
+++ b/clients/aurorae/src/themeconfig.h
@@ -88,6 +88,18 @@ public:
     int titleEdgeRight() const {
         return m_titleEdgeRight;
     }
+    int titleEdgeTopMaximized() const {
+        return m_titleEdgeTopMaximized;
+    }
+    int titleEdgeBottomMaximized() const {
+        return m_titleEdgeBottomMaximized;
+    }
+    int titleEdgeLeftMaximized() const {
+        return m_titleEdgeLeftMaximized;
+    }
+    int titleEdgeRightMaximized() const {
+        return m_titleEdgeRightMaximized;
+    }
     int titleBorderLeft() const {
         return m_titleBorderLeft;
     }
@@ -184,6 +196,10 @@ private:
     int m_titleEdgeBottom;
     int m_titleEdgeLeft;
     int m_titleEdgeRight;
+    int m_titleEdgeTopMaximized;
+    int m_titleEdgeBottomMaximized;
+    int m_titleEdgeLeftMaximized;
+    int m_titleEdgeRightMaximized;
     int m_titleBorderLeft;
     int m_titleBorderRight;
     int m_titleHeight;
diff --git a/clients/aurorae/theme-description b/clients/aurorae/theme-description
index ff080d60c6..38d5c369be 100644
--- a/clients/aurorae/theme-description
+++ b/clients/aurorae/theme-description
@@ -106,6 +106,10 @@ TitleEdgeTop=5
 TitleEdgeBottom=5
 TitleEdgeLeft=5
 TitleEdgeRight=5
+TitleEdgeTopMaximized=?         # optional - default depends on TitleEdgeTop
+TitleEdgeBottomMaximized=?      # optional - default depends on TitleEdgeBottom
+TitleEdgeLeftMaximized=?        # optional - default depends on TitleEdgeLeft
+TitleEdgeRightMaximized=?       # optional - default depends on TitleEdgeRight
 TitleBorderLeft=5
 TitleBorderRight=5
 TitleHeight=20
diff --git a/clients/aurorae/themes/example-deco/example-decorc b/clients/aurorae/themes/example-deco/example-decorc
index 2c78d9e35e..8fbb2873c2 100644
--- a/clients/aurorae/themes/example-deco/example-decorc
+++ b/clients/aurorae/themes/example-deco/example-decorc
@@ -18,6 +18,9 @@ TitleEdgeTop=5
 TitleEdgeBottom=5
 TitleEdgeLeft=5
 TitleEdgeRight=5
+TitleEdgeTopMaximized=0
+TitleEdgeLeftMaximized=0
+TitleEdgeRightMaximized=0
 TitleBorderLeft=5
 TitleBorderRight=5
 TitleHeight=20