diff --git a/ChangeLog b/ChangeLog
index dd8c283c2b..17abfafd95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
+
+	patch by: Haakon Sporsheim <haakon.sporsheim at tandberg com>
+
+	* sys/directdraw/gstdirectdrawsink.c (gst_directdraw_sink_setup_ddraw):
+	  Do IDirectDrawClipper_SetHWnd() if the window ID has already been
+	  set after creating the clipper.
+
 2008-05-07  Ole André Vadla Ravnås  <ole.andre.ravnas at tandberg com>
 
 	patch by: Haakon Sporsheim <haakon.sporsheim at tandberg com>
diff --git a/sys/directdraw/gstdirectdrawsink.c b/sys/directdraw/gstdirectdrawsink.c
index b5a9322511..d0a318b7ab 100644
--- a/sys/directdraw/gstdirectdrawsink.c
+++ b/sys/directdraw/gstdirectdrawsink.c
@@ -1308,6 +1308,9 @@ gst_directdraw_sink_setup_ddraw (GstDirectDrawSink * ddrawsink)
   hRes = IDirectDraw7_CreateClipper (ddrawsink->ddraw_object, 0,
       &ddrawsink->clipper, NULL);
 
+  if (hRes == DD_OK && ddrawsink->video_window)
+    IDirectDrawClipper_SetHWnd (ddrawsink->clipper, 0, ddrawsink->video_window);
+
   /* create our primary surface */
   if (!gst_directdraw_sink_check_primary_surface (ddrawsink))
     return FALSE;