diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index 3c5426dc80..5aa3caff5b 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -141,7 +141,12 @@ void wxMenuBar::Init(size_t n, wxMenu *menus[], const wxString titles[], long st
 
     m_menubar = gtk_menu_bar_new();
 
-    if (style & wxMB_DOCKABLE)
+    if ((style & wxMB_DOCKABLE)
+#ifdef __WXGTK3__
+        // using GtkHandleBox prevents menubar from drawing with GTK+ >= 3.19.7
+        && gtk_check_version(3,19,7)
+#endif
+        )
     {
         m_widget = gtk_handle_box_new();
         gtk_container_add(GTK_CONTAINER(m_widget), m_menubar);
diff --git a/src/gtk/toolbar.cpp b/src/gtk/toolbar.cpp
index 9416f8355f..addf63a5b2 100644
--- a/src/gtk/toolbar.cpp
+++ b/src/gtk/toolbar.cpp
@@ -388,7 +388,12 @@ bool wxToolBar::Create( wxWindow *parent,
 #endif
     GtkSetStyle();
 
-    if (style & wxTB_DOCKABLE)
+    if ((style & wxTB_DOCKABLE)
+#ifdef __WXGTK3__
+        // using GtkHandleBox prevents toolbar from drawing with GTK+ >= 3.19.7
+        && gtk_check_version(3,19,7)
+#endif
+        )
     {
         m_widget = gtk_handle_box_new();