diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index 20c13e7daf..6ad66e7cb3 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -637,12 +637,7 @@ void
 BWindow::BeginViewTransaction()
 {
 	if (Lock()) {
-		if (fInTransaction) {
-			Unlock();
-			return;
-		}
 		fInTransaction = true;
-
 		Unlock();
 	}
 }
@@ -652,13 +647,9 @@ void
 BWindow::EndViewTransaction()
 {
 	if (Lock()) {
-		if (!fInTransaction) {
-			Unlock();
-			return;
-		}
-		fLink->Flush();
+		if (fInTransaction)
+			fLink->Flush();
 		fInTransaction = false;		
-
 		Unlock();
 	}
 }