diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index cb8ac5b653..115e6f1a4b 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -1452,8 +1452,9 @@ status_t BWindow::AddToSubset(BWindow* window){
 	
 	int32		rCode;
 
-	if (window->Feel() == B_MODAL_SUBSET_WINDOW_FEEL ||
-		window->Feel() == B_FLOATING_SUBSET_WINDOW_FEEL){
+	if (window->Feel() == B_NORMAL_WINDOW_FEEL &&
+			(fFeel == B_MODAL_SUBSET_WINDOW_FEEL ||
+				fFeel == B_FLOATING_SUBSET_WINDOW_FEEL)){
 		
 		Lock();
 		session->WriteInt32( AS_ADD_TO_SUBSET );