diff --git a/src/servers/app/server/ServerApp.cpp b/src/servers/app/server/ServerApp.cpp
index aa7489b2ee..72117067b6 100644
--- a/src/servers/app/server/ServerApp.cpp
+++ b/src/servers/app/server/ServerApp.cpp
@@ -325,6 +325,7 @@ void ServerApp::_DispatchMessage(int32 code, int8 *buffer)
 			PortLink *replylink=new PortLink(reply_port);
 			replylink->SetOpCode(AS_SET_SERVER_PORT);
 			replylink->Attach((int32)newwin->_receiver);
+			replylink->Attach((int32)newwin->_token);
 			replylink->Flush();
 
 			delete replylink;
diff --git a/src/servers/app/server/ServerWindow.cpp b/src/servers/app/server/ServerWindow.cpp
index 57e8397489..cf08d04ca8 100644
--- a/src/servers/app/server/ServerWindow.cpp
+++ b/src/servers/app/server/ServerWindow.cpp
@@ -81,6 +81,8 @@ ServerWindow::ServerWindow(BRect rect, const char *string, uint32 wlook,
 	_workspace_index=index;
 	_workspace=NULL;
 
+	_token=win_token_handler.GetToken();
+
 	AddWindowToDesktop(this,index);
 }