diff --git a/3d-viewer/3d_viewer/3d_menubar.cpp b/3d-viewer/3d_viewer/3d_menubar.cpp
index a4e261d7e5..c357e0af7d 100644
--- a/3d-viewer/3d_viewer/3d_menubar.cpp
+++ b/3d-viewer/3d_viewer/3d_menubar.cpp
@@ -319,6 +319,7 @@ 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 c16cd3bfa5..0cc8f017ca 100644
--- a/cvpcb/menubar.cpp
+++ b/cvpcb/menubar.cpp
@@ -103,6 +103,7 @@ 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 60a0f5d786..ef4d82f583 100644
--- a/eeschema/libedit/menubar_libedit.cpp
+++ b/eeschema/libedit/menubar_libedit.cpp
@@ -229,6 +229,7 @@ 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 ebb4fe7034..16147b5f9f 100644
--- a/eeschema/menubar.cpp
+++ b/eeschema/menubar.cpp
@@ -343,6 +343,7 @@ 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 69ee6aa1a6..5991d1278f 100644
--- a/eeschema/sch_draw_panel.cpp
+++ b/eeschema/sch_draw_panel.cpp
@@ -197,8 +197,6 @@ 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 02da8dfbbe..da6a3e240e 100644
--- a/eeschema/sch_preview_panel.cpp
+++ b/eeschema/sch_preview_panel.cpp
@@ -87,8 +87,6 @@ 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 74542d4773..cb229e9d54 100644
--- a/eeschema/toolbars_lib_view.cpp
+++ b/eeschema/toolbars_lib_view.cpp
@@ -138,6 +138,7 @@ 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 59ce9eac36..28b541c806 100644
--- a/gerbview/gerbview_draw_panel_gal.cpp
+++ b/gerbview/gerbview_draw_panel_gal.cpp
@@ -100,7 +100,6 @@ 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 593fead151..01e8a49786 100644
--- a/gerbview/menubar.cpp
+++ b/gerbview/menubar.cpp
@@ -266,6 +266,7 @@ 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 2df94b1ea0..5281d3d900 100644
--- a/kicad/menubar.cpp
+++ b/kicad/menubar.cpp
@@ -162,6 +162,7 @@ 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 9f34865921..0eb462af8f 100644
--- a/pagelayout_editor/menubar.cpp
+++ b/pagelayout_editor/menubar.cpp
@@ -189,6 +189,7 @@ 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 ae126fbe5f..11e58cb42f 100644
--- a/pcbnew/menubar_footprint_editor.cpp
+++ b/pcbnew/menubar_footprint_editor.cpp
@@ -305,6 +305,7 @@ 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 67b80b2d32..67fb6ccab8 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -555,6 +555,7 @@ 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 3ec08a70c2..077373c719 100644
--- a/pcbnew/pcb_draw_panel_gal.cpp
+++ b/pcbnew/pcb_draw_panel_gal.cpp
@@ -416,7 +416,6 @@ 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 b5206caae6..131b4ca161 100644
--- a/pcbnew/toolbars_footprint_viewer.cpp
+++ b/pcbnew/toolbars_footprint_viewer.cpp
@@ -189,6 +189,7 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateMenuBar()
     menuBar->Append( fileMenu, _( "&File" ) );
     menuBar->Append( viewMenu, _( "&View" ) );
     AddStandardHelpMenu( menuBar );
+    menuBar->SetDoubleBuffered( true );
 
     SetMenuBar( menuBar );
     delete oldMenuBar;