diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp
index c357e0af7d..a4e261d7e5 100644
--- a/3d-viewer/3d_viewer/3d_menubar.cpp
+++ b/3d-viewer/3d_viewer/3d_menubar.cpp
@@ -319,7 +319,6 @@ void EDA_3D_VIEWER::CreateMenuBar()
     menuBar->Append( viewMenu, _( "&View" ) );
     menuBar->Append( prefsMenu, _( "&Preferences" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
 }
diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp
index 0cc8f017ca..c16cd3bfa5 100644
--- a/cvpcb/menubar.cpp
+++ b/cvpcb/menubar.cpp
@@ -103,7 +103,6 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
     menuBar->Append( editMenu, _( "&Edit" ) );
     menuBar->Append( prefsMenu, _( "&Preferences" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;
diff --git a/eeschema/libedit/menubar_libedit.cpp b/eeschema/libedit/menubar_libedit.cpp
index 8ddf7d59e1..b53b38b271 100644
--- a/eeschema/libedit/menubar_libedit.cpp
+++ b/eeschema/libedit/menubar_libedit.cpp
@@ -229,7 +229,6 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
     menuBar->Append( inspectMenu, _( "&Inspect" ) );
     menuBar->Append( prefsMenu, _( "P&references" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;
diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp
index 559332e00f..8c755383e3 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -343,7 +343,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
     menuBar->Append( toolsMenu, _( "&Tools" ) );
     menuBar->Append( prefsMenu, _( "P&references" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;
diff --git a/eeschema/sch_draw_panel.cpp b/eeschema/sch_draw_panel.cpp
index 5991d1278f..69ee6aa1a6 100644
--- a/eeschema/sch_draw_panel.cpp
+++ b/eeschema/sch_draw_panel.cpp
@@ -197,6 +197,8 @@ void SCH_DRAW_PANEL::OnShow()
         if( frame )
             frame->ActivateGalCanvas();
     }
+
+    m_parent->SetDoubleBuffered( true );
 }
 
 
diff --git a/eeschema/sch_preview_panel.cpp b/eeschema/sch_preview_panel.cpp
index da6a3e240e..02da8dfbbe 100644
--- a/eeschema/sch_preview_panel.cpp
+++ b/eeschema/sch_preview_panel.cpp
@@ -87,6 +87,8 @@ SCH_PREVIEW_PANEL::~SCH_PREVIEW_PANEL()
 
 void SCH_PREVIEW_PANEL::OnShow()
 {
+    m_parent->SetDoubleBuffered( true );
+
     //m_view->RecacheAllItems();
 }
 
diff --git a/eeschema/toolbars_lib_view.cpp b/eeschema/toolbars_lib_view.cpp
index cb229e9d54..74542d4773 100644
--- a/eeschema/toolbars_lib_view.cpp
+++ b/eeschema/toolbars_lib_view.cpp
@@ -138,7 +138,6 @@ void LIB_VIEW_FRAME::ReCreateMenuBar()
     menuBar->Append( fileMenu, _( "&File" ) );
     menuBar->Append( viewMenu, _( "&View" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;
diff --git a/gerbview/gerbview_draw_panel_gal.cpp b/gerbview/gerbview_draw_panel_gal.cpp
index 28b541c806..59ce9eac36 100644
--- a/gerbview/gerbview_draw_panel_gal.cpp
+++ b/gerbview/gerbview_draw_panel_gal.cpp
@@ -100,6 +100,7 @@ void GERBVIEW_DRAW_PANEL_GAL::OnShow()
 
     if( frame )
     {
+        m_parent->SetDoubleBuffered( true );
         SetTopLayer( frame->GetActiveLayer() );
         auto& displ_opts = frame->GetDisplayOptions();
         static_cast<KIGFX::GERBVIEW_RENDER_SETTINGS*>(
diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp
index 01e8a49786..593fead151 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -266,7 +266,6 @@ void GERBVIEW_FRAME::ReCreateMenuBar()
     menuBar->Append( toolsMenu, _( "&Tools" ) );
     menuBar->Append( preferencesMenu, _( "&Preferences" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     // Associate the menu bar with the frame, if no previous menubar
     SetMenuBar( menuBar );
diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp
index 5281d3d900..2df94b1ea0 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -162,7 +162,6 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
     menuBar->Append( toolsMenu, _( "&Tools" ) );
     menuBar->Append( prefsMenu, _( "&Preferences" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;
diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp
index fc0302ba60..3aa20a21da 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -189,7 +189,6 @@ void PL_EDITOR_FRAME::ReCreateMenuBar()
     menuBar->Append( inspectorMenu, _( "&Inspect" ) );
     menuBar->Append( preferencesMenu, _( "P&references" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;
diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp
index 5f61b96fb3..1a172628c6 100644
--- a/pcbnew/menubar_footprint_editor.cpp
+++ b/pcbnew/menubar_footprint_editor.cpp
@@ -306,7 +306,6 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
     menuBar->Append( toolsMenu, _( "&Tools" ) );
     menuBar->Append( prefsMenu, _( "P&references" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;
diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index e493c52ba4..de17ef2b90 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -555,7 +555,6 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     menuBar->Append( toolsMenu, _( "&Tools" ) );
     menuBar->Append( prefsMenu, _( "P&references" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;
diff --git a/pcbnew/pcb_draw_panel_gal.cpp b/pcbnew/pcb_draw_panel_gal.cpp
index 077373c719..3ec08a70c2 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -416,6 +416,7 @@ void PCB_DRAW_PANEL_GAL::OnShow()
 
     if( frame )
     {
+        m_parent->SetDoubleBuffered( true );
         SetTopLayer( frame->GetActiveLayer() );
         KIGFX::PAINTER* painter = m_view->GetPainter();
         auto settings = static_cast<KIGFX::PCB_RENDER_SETTINGS*>( painter->GetSettings() );
diff --git a/pcbnew/toolbars_footprint_viewer.cpp b/pcbnew/toolbars_footprint_viewer.cpp
index 131b4ca161..b5206caae6 100644
--- a/pcbnew/toolbars_footprint_viewer.cpp
+++ b/pcbnew/toolbars_footprint_viewer.cpp
@@ -189,7 +189,6 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateMenuBar()
     menuBar->Append( fileMenu, _( "&File" ) );
     menuBar->Append( viewMenu, _( "&View" ) );
     AddStandardHelpMenu( menuBar );
-    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;