diff --git a/src/servers/app/RootLayer.cpp b/src/servers/app/RootLayer.cpp
index a1def6fa0a..ac04b0c401 100644
--- a/src/servers/app/RootLayer.cpp
+++ b/src/servers/app/RootLayer.cpp
@@ -105,13 +105,15 @@ RootLayer::RootLayer(const char *name, int32 workspaceCount,
 	fClassID = AS_ROOTLAYER_CLASS;
 	fHidden	= false;
 
-	fListenPort = find_port(SERVER_INPUT_PORT);
-	if (fListenPort == B_NAME_NOT_FOUND)
-		return;
-	
 	// Spawn our working thread
 //	fThreadID = spawn_thread(WorkingThread, name, B_REAL_TIME_DISPLAY_PRIORITY, this);
 	fThreadID = spawn_thread(WorkingThread, name, B_DISPLAY_PRIORITY, this);
+	
+	fListenPort = find_port(SERVER_INPUT_PORT);
+	if (fListenPort == B_NAME_NOT_FOUND) {
+		fListenPort = -1;
+		return;
+	}
 }
 
 RootLayer::~RootLayer()
diff --git a/src/servers/app/drawing/AccelerantHWInterface.cpp b/src/servers/app/drawing/AccelerantHWInterface.cpp
index 95a012714d..0e9ec5022f 100644
--- a/src/servers/app/drawing/AccelerantHWInterface.cpp
+++ b/src/servers/app/drawing/AccelerantHWInterface.cpp
@@ -99,6 +99,13 @@ AccelerantHWInterface::AccelerantHWInterface()
 	fDisplayMode.virtual_width = 640;
 	fDisplayMode.virtual_height = 480;
 	fDisplayMode.space = B_RGB32;
+	
+	// TODO: Move this to a more general place
+	// we need this under Haiku too, as it is where the input_server
+	// sends it's data to.
+	port_id serverInputPort = create_port(200, SERVER_INPUT_PORT);
+	if (serverInputPort == B_NO_MORE_PORTS)
+		debugger("AccelerantDriver: out of ports\n");
 }
 
 // destructor