diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp
index 576a96ffae..b82c6f5baa 100644
--- a/eeschema/viewlib_frame.cpp
+++ b/eeschema/viewlib_frame.cpp
@@ -74,6 +74,7 @@ BEGIN_EVENT_TABLE( LIB_VIEW_FRAME, EDA_DRAW_FRAME )
     /* listbox events */
     EVT_LISTBOX( ID_LIBVIEW_LIB_LIST, LIB_VIEW_FRAME::ClickOnLibList )
     EVT_LISTBOX( ID_LIBVIEW_CMP_LIST, LIB_VIEW_FRAME::ClickOnCmpList )
+    EVT_LISTBOX_DCLICK( ID_LIBVIEW_CMP_LIST, LIB_VIEW_FRAME::DClickOnCmpList )
 
     EVT_MENU( ID_SET_RELATIVE_OFFSET, LIB_VIEW_FRAME::OnSetRelativeOffset )
 END_EVENT_TABLE()
@@ -312,12 +313,12 @@ void LIB_VIEW_FRAME::OnSashDrag( wxSashEvent& event )
         break;
 
     case ID_LIBVIEW_CMPWINDOW:
-    {
-        wxAuiPaneInfo& pane = m_auimgr.GetPane( m_CmpListWindow );
-        m_CmpListSize.x = event.GetDragRect().width;
-        pane.MinSize( m_CmpListSize );
-        m_auimgr.Update();
-    }
+        {
+            wxAuiPaneInfo& pane = m_auimgr.GetPane( m_CmpListWindow );
+            m_CmpListSize.x = event.GetDragRect().width;
+            pane.MinSize( m_CmpListSize );
+            m_auimgr.Update();
+        }
         break;
     }
 }
@@ -497,6 +498,18 @@ void LIB_VIEW_FRAME::ClickOnCmpList( wxCommandEvent& event )
     }
 }
 
+void LIB_VIEW_FRAME::DClickOnCmpList( wxCommandEvent& event )
+{
+    if( m_Semaphore )
+    {
+        ExportToSchematicLibraryPart( event );
+
+        // Prevent the double click from being as a single click in the parent
+        // window which would cause the part to be parked rather than staying
+        // in drag mode.
+        event.StopPropagation();
+    }
+}
 
 void LIB_VIEW_FRAME::ExportToSchematicLibraryPart( wxCommandEvent& event )
 {
diff --git a/eeschema/viewlib_frame.h b/eeschema/viewlib_frame.h
index 49099a2c92..cb22fef52a 100644
--- a/eeschema/viewlib_frame.h
+++ b/eeschema/viewlib_frame.h
@@ -166,6 +166,7 @@ private:
     void ExportToSchematicLibraryPart( wxCommandEvent& event );
     void ViewOneLibraryContent( CMP_LIBRARY* Lib, int Flag );
     bool OnRightClick( const wxPoint& MousePos, wxMenu* PopMenu );
+    void DClickOnCmpList( wxCommandEvent& event );
 
     DECLARE_EVENT_TABLE()
 };