diff --git a/eeschema/sch_bus_entry.cpp b/eeschema/sch_bus_entry.cpp
index 1819cae51d..9f73d737dc 100644
--- a/eeschema/sch_bus_entry.cpp
+++ b/eeschema/sch_bus_entry.cpp
@@ -201,11 +201,13 @@ void SCH_BUS_ENTRY_BASE::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint&
     // Draw pin targets if part is being dragged
     bool dragging = ( aPanel->GetScreen()->GetCurItem() == this );
 
-    if( m_isDanglingStart || dragging ) {
+    if( m_isDanglingStart || dragging )
+    {
         GRCircle( clipbox, aDC, m_pos.x + aOffset.x, m_pos.y + aOffset.y, TARGET_BUSENTRY_RADIUS, 0, color );
     }
 
-    if( m_isDanglingEnd || dragging ) {
+    if( m_isDanglingEnd || dragging )
+    {
         GRCircle( clipbox, aDC, m_End().x + aOffset.x, m_End().y + aOffset.y, TARGET_BUSENTRY_RADIUS, 0, color );
     }
 }
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 33e724c42f..0068c2dd11 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -437,10 +437,15 @@ bool ROUTER_TOOL::onViaCommand( VIATYPE_T aType )
             return false;
     }
 
-
     sizes.SetViaType( aType );
-    m_router->ToggleViaPlacement();
+    if( VIA_MICROVIA == aType )
+    {
+        sizes.SetViaDiameter( bds.GetCurrentMicroViaSize() );
+        sizes.SetViaDrill( bds.GetCurrentMicroViaDrill() );
+    }
+            
     m_router->UpdateSizes( sizes );
+    m_router->ToggleViaPlacement();
 
     m_router->Move( m_endSnapPoint, m_endItem );        // refresh