diff --git a/geometry.cpp b/geometry.cpp
index c9fe5fafba..a87d7f7ea8 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -2219,7 +2219,7 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
         clientArea = workspace()->clientArea( MaximizeArea, this );
 
     if( options->borderlessMaximizedWindows() )
-        setNoBorder(max_mode == MaximizeFull);
+        setNoBorder(app_noborder || max_mode == MaximizeFull);
 
     // save sizes for restoring, if maximalizing
     if( !adjust && !( y() == clientArea.top() && height() == clientArea.height()))