diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index af003a6db2..e67b69ed0e 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -1859,8 +1859,7 @@ Desktop::MinimizeApplication(team_id team)
 		if (window->ServerWindow()->ClientTeam() != team)
 			continue;
 
-		if ((window->Flags() & B_NOT_MINIMIZABLE) == 0)
-			window->ServerWindow()->NotifyMinimize(true);
+		window->ServerWindow()->NotifyMinimize(true);
 	}
 }
 
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 49ae78451b..ad6e107b0c 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -425,7 +425,8 @@ ServerWindow::NotifyQuitRequested()
 void
 ServerWindow::NotifyMinimize(bool minimize)
 {
-	if (fWindow->Feel() != B_NORMAL_WINDOW_FEEL)
+	if (fWindow->Feel() != B_NORMAL_WINDOW_FEEL
+		|| ((fWindow->Flags() & B_NOT_MINIMIZABLE) == 0 && minimize))
 		return;
 
 	// The client is responsible for the actual minimization