diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 87b57bfa5b..44881cd9b6 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -532,7 +532,7 @@ void ROUTER_TOOL::saveRouterDebugLog()
         m_router->Settings().Mode(),
         m_router->Settings().RemoveLoops() ? 1 : 0,
         m_router->Settings().GetFixAllSegments() ? 1 : 0,
-        m_router->Settings().GetCornerMode()
+        static_cast<int>( m_router->Settings().GetCornerMode() )
      );
 
     const auto& events = logger->GetEvents();
@@ -1203,6 +1203,7 @@ void ROUTER_TOOL::performRouting()
         else if( evt->IsAction( &ACT_SwitchRounding ) )
         {
             m_router->ToggleRounded();
+            updateMessagePanel();
             updateEndItem( *evt );
             m_router->Move( m_endSnapPoint, m_endItem );        // refresh
         }
@@ -1283,6 +1284,8 @@ int ROUTER_TOOL::SettingsDialog( const TOOL_EVENT& aEvent )
 
     settingsDlg.ShowModal();
 
+    updateMessagePanel();
+
     return 0;
 }
 
@@ -2040,6 +2043,26 @@ void ROUTER_TOOL::updateMessagePanel()
         items.emplace_back( _( "Routing Track" ), _( "(no net)" ) );
     }
 
+    wxString cornerMode;
+
+    if( m_router->Settings().GetFreeAngleMode() )
+    {
+        cornerMode = _( "Free-angle" );
+    }
+    else
+    {
+        switch( m_router->Settings().GetCornerMode() )
+        {
+        case PNS::CORNER_MODE::MITERED_45: cornerMode = _( "45-degree" );         break;
+        case PNS::CORNER_MODE::ROUNDED_45: cornerMode = _( "45-degree rounded" ); break;
+        case PNS::CORNER_MODE::MITERED_90: cornerMode = _( "90-degree" );         break;
+        case PNS::CORNER_MODE::ROUNDED_90: cornerMode = _( "90-degree rounded" ); break;
+        default: break;
+        }
+    }
+
+    items.emplace_back( _( "Corner Style" ), cornerMode );
+
     EDA_UNITS units = frame()->GetUserUnits();
 
     int width = isDiffPair ? sizes.DiffPairWidth() : sizes.TrackWidth();