diff --git a/eeschema/default_values.h b/eeschema/default_values.h
index f6a0d598d3..00303fec5a 100644
--- a/eeschema/default_values.h
+++ b/eeschema/default_values.h
@@ -29,6 +29,9 @@
 ///< The size of the rectangle indicating an unconnected wire or label
 #define DANGLING_SYMBOL_SIZE 12
 
+///< The size of the rectangle indicating a connected, unselected wire end
+#define UNSELECTED_END_SIZE 4
+
 ///< The default pin len value when creating pins(can be changed in preference menu)
 #define DEFAULT_PIN_LENGTH 100
 
diff --git a/eeschema/sch_painter.cpp b/eeschema/sch_painter.cpp
index 8216bb5124..cda66f8296 100644
--- a/eeschema/sch_painter.cpp
+++ b/eeschema/sch_painter.cpp
@@ -1624,10 +1624,15 @@ void SCH_PAINTER::draw( const LIB_PIN *aPin, int aLayer, bool aDimmed )
 // Draw the target (an open square) for a wire or label which has no connection or is
 // being moved.
 void SCH_PAINTER::drawDanglingSymbol( const VECTOR2I& aPos, const COLOR4D& aColor, int aWidth,
-                                      bool aDrawingShadows, bool aBrightened )
+                                      bool aDangling, bool aDrawingShadows, bool aBrightened )
 {
-    VECTOR2I radius( aWidth + schIUScale.MilsToIU( DANGLING_SYMBOL_SIZE / 2 ),
-                     aWidth + schIUScale.MilsToIU( DANGLING_SYMBOL_SIZE / 2 ) );
+    int size = aDangling ? DANGLING_SYMBOL_SIZE : UNSELECTED_END_SIZE;
+
+    if( !aDangling )
+        aWidth /= 2;
+
+    VECTOR2I radius( aWidth + schIUScale.MilsToIU( size / 2 ),
+                     aWidth + schIUScale.MilsToIU( size / 2 ) );
 
     // Dangling symbols must be drawn in a slightly different colour so they can be seen when
     // they overlap with a junction dot.
@@ -1684,24 +1689,26 @@ void SCH_PAINTER::draw( const SCH_LINE *aLine, int aLayer )
     if( drawingDangling || drawingShadows )
     {
         if( ( aLine->IsWire() && aLine->IsStartDangling() )
-            || ( aLine->IsGraphicLine() && aLine->IsSelected() && !aLine->IsNew()
+            || ( drawingShadows && aLine->IsSelected() && !aLine->IsNew()
                  && !aLine->HasFlag( STARTPOINT ) ) )
         {
             COLOR4D danglingColor =
                     ( drawingShadows && !aLine->HasFlag( STARTPOINT ) ) ? color.Inverted() : color;
             drawDanglingSymbol( aLine->GetStartPoint(), danglingColor,
-                                getLineWidth( aLine, drawingShadows ), drawingShadows,
+                                getLineWidth( aLine, drawingShadows ),
+                                aLine->IsWire() && aLine->IsStartDangling(), drawingShadows,
                                 aLine->IsBrightened() );
         }
 
         if( ( aLine->IsWire() && aLine->IsEndDangling() )
-            || ( aLine->IsGraphicLine() && aLine->IsSelected() && !aLine->IsNew()
+            || ( drawingShadows && aLine->IsSelected() && !aLine->IsNew()
                  && !aLine->HasFlag( ENDPOINT ) ) )
         {
             COLOR4D danglingColor =
                     ( drawingShadows && !aLine->HasFlag( ENDPOINT ) ) ? color.Inverted() : color;
             drawDanglingSymbol( aLine->GetEndPoint(), danglingColor,
-                                getLineWidth( aLine, drawingShadows ), drawingShadows,
+                                getLineWidth( aLine, drawingShadows ),
+                                aLine->IsWire() && aLine->IsEndDangling(), drawingShadows,
                                 aLine->IsBrightened() );
         }
 
@@ -1914,8 +1921,8 @@ void SCH_PAINTER::draw( const SCH_TEXT *aText, int aLayer )
         if( aText->IsDangling() )
         {
             drawDanglingSymbol( aText->GetTextPos(), color,
-                                schIUScale.MilsToIU( DANGLING_SYMBOL_SIZE / 2 ), drawingShadows,
-                                aText->IsBrightened() );
+                                schIUScale.MilsToIU( DANGLING_SYMBOL_SIZE / 2 ), true,
+                                drawingShadows, aText->IsBrightened() );
         }
 
         return;
@@ -2514,7 +2521,8 @@ void SCH_PAINTER::draw( const SCH_DIRECTIVE_LABEL *aLabel, int aLayer )
     {
         if( aLabel->IsDangling() )
         {
-            drawDanglingSymbol( aLabel->GetTextPos(), color, schIUScale.MilsToIU( DANGLING_SYMBOL_SIZE / 2 ),
+            drawDanglingSymbol( aLabel->GetTextPos(), color,
+                                schIUScale.MilsToIU( DANGLING_SYMBOL_SIZE / 2 ), true,
                                 drawingShadows, aLabel->IsBrightened() );
         }
 
diff --git a/eeschema/sch_painter.h b/eeschema/sch_painter.h
index 14bb122800..26903b0902 100644
--- a/eeschema/sch_painter.h
+++ b/eeschema/sch_painter.h
@@ -172,7 +172,7 @@ private:
     void drawPinDanglingSymbol( const VECTOR2I& aPos, const COLOR4D& aColor,
                                 bool aDrawingShadows, bool aBrightened );
     void drawDanglingSymbol( const VECTOR2I& aPos, const COLOR4D& aColor, int aWidth,
-                             bool aDrawingShadows, bool aBrightened );
+                             bool aDangling, bool aDrawingShadows, bool aBrightened );
 
     int internalPinDecoSize( const LIB_PIN &aPin );
     int externalPinDecoSize( const LIB_PIN &aPin );