Index: vcl/source/control/combobox.cxx
===================================================================
--- vcl/source/control/combobox.cxx	(revision 273871)
+++ vcl/source/control/combobox.cxx	(working copy)
@@ -804,14 +804,8 @@
 
 long ComboBox::PreNotify( NotifyEvent& rNEvt )
 {
-	long nDone = 0;
 
-	if( ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) && ( rNEvt.GetWindow() == mpImplLB->GetMainWindow() ) )
-	{
-		mpSubEdit->GrabFocus();
-	}
-
-	return nDone ? nDone : Edit::PreNotify( rNEvt );
+	return Edit::PreNotify( rNEvt );
 }
 
 // -----------------------------------------------------------------------
@@ -890,6 +884,10 @@
             nDone = 0;  // don't eat this event, let the default handling happen (i.e. scroll the context)
         }
 	}
+    else if( ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) && ( rNEvt.GetWindow() == mpImplLB->GetMainWindow() ) )
+	{
+		mpSubEdit->GrabFocus();
+	}
 
 	return nDone ? nDone : Edit::Notify( rNEvt );
 }