diff --git a/src/inkscape-window.cpp b/src/inkscape-window.cpp
index 7d1e8093e369b7c0a15b9150b776668720ba3a1d..74ea39a7c32e8bb63c6ca6bd9f778345c10d06fe 100644
--- a/src/inkscape-window.cpp
+++ b/src/inkscape-window.cpp
@@ -122,10 +122,6 @@ InkscapeWindow::setup_view()
     //       the window, but a call to hide() causes Inkscape to just exit since the migration to Gtk::Application
     show();
 
-    // TODO: Extra call seems to ensure toolbar widgets are visible after programmatic resize
-    // (incomplete workaround for https://gitlab.com/inkscape/inkscape/issues/125)
-    check_resize();
-
     sp_namedview_zoom_and_view_from_document(_desktop);
     sp_namedview_update_layers_from_document(_desktop);
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 94a04d73ed782feaafcc064b635cad55ad73b122..b60fd59f3d961f14da557ad1dc8e57347c049c10 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -725,7 +725,15 @@ void update_aux_toolbox(SPDesktop * /*desktop*/, ToolBase *eventcontext, GtkWidg
         } else {
             gtk_widget_hide(sub_toolbox);
         }
+        //FIX issue #Inkscape686
+        GtkAllocation allocation;
+        gtk_widget_get_allocation(sub_toolbox, &allocation);
+        gtk_widget_size_allocate(sub_toolbox, &allocation);
     }
+    //FIX issue #Inkscape125
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(toolbox, &allocation);
+    gtk_widget_size_allocate(toolbox, &allocation);  
 }
 
 void setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop)