diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 910c884a7..9bf4514a0 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -457,13 +457,13 @@ xf86PostProbe(void)
 void
 xf86PostScreenInit(void)
 {
+    xf86VGAarbiterWrapFunctions();
+
     if (fbSlotClaimed) {
 	SetSIGIOForState(OPERATING);
 	return;
     }
 
-    xf86VGAarbiterWrapFunctions();
-
     DebugF("PostScreenInit  generation: %i\n",serverGeneration);
     xf86EnterServerState(OPERATING);
 }