diff --git a/common/widgets/unit_binder.cpp b/common/widgets/unit_binder.cpp
index e0ca81b831..3f1962c0db 100644
--- a/common/widgets/unit_binder.cpp
+++ b/common/widgets/unit_binder.cpp
@@ -142,10 +142,9 @@ void UNIT_BINDER::onClick( wxMouseEvent& aEvent )
         // These are tokens, not strings, so do a select all
         textEntry->SelectAll();
     }
-    else
-    {
-        aEvent.Skip();
-    }
+
+    // Needed at least on Windows to avoid hanging
+    aEvent.Skip();
 }
 
 
diff --git a/eeschema/dialogs/dialog_wire_bus_properties.cpp b/eeschema/dialogs/dialog_wire_bus_properties.cpp
index 71ec5bafa2..3f4462ff90 100644
--- a/eeschema/dialogs/dialog_wire_bus_properties.cpp
+++ b/eeschema/dialogs/dialog_wire_bus_properties.cpp
@@ -64,7 +64,7 @@ bool DIALOG_WIRE_BUS_PROPERTIES::TransferDataToWindow()
 {
     STROKE_PARAMS stroke;
     COLOR4D       color;
-    int           dotSize;
+    int           dotSize = -1;     // set value to "not found"
 
     for( SCH_ITEM* item : m_items )
     {
@@ -140,7 +140,14 @@ bool DIALOG_WIRE_BUS_PROPERTIES::TransferDataToWindow()
                         || static_cast<const SCH_JUNCTION*>( item )->GetDiameter() == dotSize;
             } ) )
     {
-        m_junctionSize.SetValue( dotSize );
+        if( dotSize >=0 )
+            m_junctionSize.SetValue( dotSize );
+        else
+        {
+            // No junction found in selected items: disable m_junctionSize
+            m_junctionSize.Enable( false );
+            m_junctionSize.SetValue( INDETERMINATE_ACTION );
+        }
     }
     else
     {