diff --git a/app/gui/gimpuiconfigurer.c b/app/gui/gimpuiconfigurer.c
index abe503b3b943e62c82ad81ba83d5d02a01420ad5..fcacd1a979121ec0dd2c8a33d1048e6a91617cab 100644
--- a/app/gui/gimpuiconfigurer.c
+++ b/app/gui/gimpuiconfigurer.c
@@ -335,6 +335,10 @@ gimp_ui_configurer_move_docks_to_window (GimpUIConfigurer  *ui_configurer,
   GtkWidget    *dock_window      = NULL;
   GtkAllocation original_size    = { 0, 0, 0, 0 };
 
+  /* Are there docks to move at all? */
+  if (! docks)
+    return;
+
   /* Remember the size so we can set the new dock window to the same
    * size
    */