diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86d766b5..d3fa4c63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,18 @@ FlatLaf Change Log
 
 - Tree: Support for alternate row highlighting. (PR #903)
 - Extras: `FlatSVGIcon` color filters now can access painting component to
-  implement component state based color mappings. (PR #906)
+  implement component state based color mappings. (issue #906)
+
+
+## 3.5.4
 
 #### Fixed bugs
 
 - HTML: Fixed NPE when using HTML text on a component with `null` font. (issue
   #930; PR #931; regression in 3.5)
+- Linux: Fixed NPE when using FlatLaf window decorations and switching theme.
+  (issue #933; regression in 3.5.3)
+
 
 ## 3.5.3
 
diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java
index c466ecf8..a7a77b08 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatWindowResizer.java
@@ -272,7 +272,8 @@ public abstract class FlatWindowResizer
 		public void doLayout() {
 			super.doLayout();
 
-			centerComp.setBounds( 0, 0, resizeComp.getWidth(), resizeComp.getHeight() );
+			if( centerComp != null && centerComp.isVisible() )
+				centerComp.setBounds( 0, 0, resizeComp.getWidth(), resizeComp.getHeight() );
 		}
 
 		@Override
@@ -376,6 +377,7 @@ public abstract class FlatWindowResizer
 
 		@Override
 		protected void beginResizing( int resizeDir ) {
+			centerComp.setBounds( 0, 0, resizeComp.getWidth(), resizeComp.getHeight() );
 			centerComp.setCursor( getPredefinedCursor( resizeDir ) );
 			centerComp.setVisible( true );
 		}
diff --git a/gradle.properties b/gradle.properties
index d2172da3..6902d50c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-flatlaf.releaseVersion     = 3.5.3
+flatlaf.releaseVersion     = 3.5.4
 flatlaf.developmentVersion = 3.6-SNAPSHOT
 
 org.gradle.parallel = true