diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c
index 2af8f8d288..ac520857e2 100644
--- a/app/tools/gimpbucketfilltool.c
+++ b/app/tools/gimpbucketfilltool.c
@@ -195,6 +195,9 @@ gimp_bucket_fill_tool_button_release (GimpTool              *tool,
 
   GIMP_TOOL_CLASS (parent_class)->button_release (tool, coords, time, state,
                                                   release_type, display);
+
+  tool->display  = NULL;
+  tool->drawable = NULL;
 }
 
 static void