diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index bfc72ca8a1..686e896949 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -1898,7 +1898,8 @@ Desktop::_ShowWindow(Window* window, bool affectsOtherWindows)
 	} else
 		MarkDirty(dirty);
 
-	window->ServerWindow()->HandleDirectConnection(B_DIRECT_START | B_BUFFER_RESET);
+	window->ServerWindow()->HandleDirectConnection(
+		B_DIRECT_START | B_BUFFER_RESET);
 }
 
 
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 23fdfbdba1..de28b5b3e5 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -385,9 +385,6 @@ ServerWindow::_Show()
 	fDesktop->UnlockSingleWindow();
 	fDesktop->ShowWindow(fWindow);
 	fDesktop->LockSingleWindow();
-
-	if (fDirectWindowData != NULL)
-		HandleDirectConnection(B_DIRECT_START | B_BUFFER_RESET);
 }
 
 
@@ -397,15 +394,11 @@ ServerWindow::_Show()
 void
 ServerWindow::_Hide()
 {
-	// NOTE: if you do something else, other than sending a port message, PLEASE lock
 	STRACE(("ServerWindow %s: _Hide\n", Title()));
 
 	if (fWindow->IsHidden() || fWindow->IsOffscreenWindow())
 		return;
 
-	if (fDirectWindowData != NULL)
-		HandleDirectConnection(B_DIRECT_STOP);
-
 	fDesktop->UnlockSingleWindow();
 	fDesktop->HideWindow(fWindow);
 	fDesktop->LockSingleWindow();