diff --git a/ChangeLog b/ChangeLog
index e47296cc19..1e2eb9549a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-20  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+	* gst/selector/gstinputselector.c: (gst_selector_pad_class_init),
+	(gst_selector_pad_event), (gst_selector_pad_bufferalloc),
+	(gst_selector_pad_chain), (gst_input_selector_set_active_pad):
+	Release the selector lock when pad alloc happens on a non selected pad.
+
 2008-03-20  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/selector/gstinputselector.c: (gst_selector_pad_class_init),
diff --git a/gst/selector/gstinputselector.c b/gst/selector/gstinputselector.c
index 852a9bec57..4f169cf68a 100644
--- a/gst/selector/gstinputselector.c
+++ b/gst/selector/gstinputselector.c
@@ -480,6 +480,8 @@ done:
   /* ERRORS */
 not_active:
   {
+    GST_INPUT_SELECTOR_UNLOCK (sel);
+
     /* unselected pad, perform fallback alloc or return unlinked when
      * asked */
     GST_OBJECT_LOCK (selpad);