diff --git a/src/video/directfb/SDL_DirectFB_modes.c b/src/video/directfb/SDL_DirectFB_modes.c
index 4f8d4cc9a..86a47c89e 100644
--- a/src/video/directfb/SDL_DirectFB_modes.c
+++ b/src/video/directfb/SDL_DirectFB_modes.c
@@ -348,9 +348,11 @@ DirectFB_InitModes(_THIS)
         display.driverdata = dispdata;
 
 #if (DIRECTFB_MAJOR_VERSION == 1) && (DIRECTFB_MINOR_VERSION >= 2)
-       	dlc.flags = DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT | DLCONF_OPTIONS;
-       	ret = layer->SetConfiguration(layer, &dlc);
- #endif
+        dlc.flags =
+            DLCONF_WIDTH | DLCONF_HEIGHT | DLCONF_PIXELFORMAT |
+            DLCONF_OPTIONS;
+        ret = layer->SetConfiguration(layer, &dlc);
+#endif
 
         SDL_DFB_CHECKERR(layer->SetCooperativeLevel(layer, DLSCL_SHARED));
 
@@ -467,7 +469,7 @@ DirectFB_SetDisplayMode(_THIS, SDL_DisplayMode * mode)
                     mode->format);
         return -1;
     }
-    
+
     data->pixelformat = rconfig.pixelformat;
     data->cw = config.width;
     data->ch = config.height;
diff --git a/src/video/directfb/SDL_DirectFB_mouse.c b/src/video/directfb/SDL_DirectFB_mouse.c
index 5531e2de3..b28a511c7 100644
--- a/src/video/directfb/SDL_DirectFB_mouse.c
+++ b/src/video/directfb/SDL_DirectFB_mouse.c
@@ -49,7 +49,8 @@ DirectFB_InitMouse(_THIS)
     mouse.WarpMouse = DirectFB_WarpMouse;
     mouse.FreeMouse = DirectFB_FreeMouse;
     mouse.cursor_shown = 1;
-    devdata->mouse = SDL_AddMouse(&mouse, -1, "Mouse", 0, 0, 1);
+    SDL_SetMouseIndexId(0, 0);  /* ID == Index ! */
+    devdata->mouse = SDL_AddMouse(&mouse, 0, "Mouse", 0, 0, 1);
 }
 
 void