diff --git a/common/zoom.cpp b/common/zoom.cpp
index ef04c78dfc..8d4ae6740f 100644
--- a/common/zoom.cpp
+++ b/common/zoom.cpp
@@ -40,6 +40,7 @@
 #include <hotkeys_basic.h>
 #include <menus_helpers.h>
 #include <base_units.h>
+#include <tool/tool_manager.h>
 
 
 void EDA_DRAW_FRAME::RedrawScreen( const wxPoint& aCenterPoint, bool aWarpPointer )
@@ -90,6 +91,8 @@ void EDA_DRAW_FRAME::Zoom_Automatique( bool aWarpPointer )
 
     if( !IsGalCanvasActive() )
         RedrawScreen( GetScrollCenterPosition(), aWarpPointer );
+    else
+        m_toolManager->RunAction( "common.Control.zoomFitScreen", true );
 }