diff --git a/common/tool/common_tools.cpp b/common/tool/common_tools.cpp
index c50bc525ae..b8cc661e23 100644
--- a/common/tool/common_tools.cpp
+++ b/common/tool/common_tools.cpp
@@ -235,10 +235,9 @@ int COMMON_TOOLS::ZoomFitScreen( const TOOL_EVENT& aEvent )
 {
     KIGFX::VIEW* view = getView();
     EDA_DRAW_PANEL_GAL* galCanvas = m_frame->GetGalCanvas();
-    EDA_ITEM* model = getModel<EDA_ITEM>();
-    EDA_BASE_FRAME* frame = getEditFrame<EDA_BASE_FRAME>();
+    EDA_DRAW_FRAME* frame = getEditFrame<EDA_DRAW_FRAME>();
 
-    BOX2I bBox = model->ViewBBox();
+    BOX2I bBox = frame->GetDocumentExtents();
     VECTOR2D scrollbarSize = VECTOR2D( galCanvas->GetSize() - galCanvas->GetClientSize() );
     VECTOR2D screenSize = view->ToWorld( galCanvas->GetClientSize(), false );
 
diff --git a/include/pcb_base_frame.h b/include/pcb_base_frame.h
index 1bcf2a16e0..fec63ee41c 100644
--- a/include/pcb_base_frame.h
+++ b/include/pcb_base_frame.h
@@ -133,6 +133,11 @@ public:
      */
     EDA_RECT    GetBoardBoundingBox( bool aBoardEdgesOnly = false ) const;
 
+    const BOX2I GetDocumentExtents() const override
+    {
+        return GetBoardBoundingBox( false );
+    }
+
     virtual void SetPageSettings( const PAGE_INFO& aPageSettings ) override;
     const PAGE_INFO& GetPageSettings() const override;
     const wxSize GetPageSizeIU() const override;