diff --git a/ChangeLog b/ChangeLog
index 5bbb22223d..e0739ed975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr  2 04:06:50 EST 1998 Matthew Wilson <msw@gimp.org>
+
+	* app/disp_callbacks.c: Always ungrab the pointer on button release.
+	This is a quick and dirty hack to try to nuke the pointer grab
+	bug.
+	
 Thu Apr  2 01:49:34 EST 1998 Matthew Wilson <msw@gimp.org>
 
 	* app/transform_core.c: added a change to make a note of the
diff --git a/app/disp_callbacks.c b/app/disp_callbacks.c
index 11633bda49..5090fb8b40 100644
--- a/app/disp_callbacks.c
+++ b/app/disp_callbacks.c
@@ -182,6 +182,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
 	{
 	case 1:
 	  gtk_grab_remove (canvas);
+	  gdk_pointer_ungrab (bevent->time);  /* fixes pointer grab bug */
 	  if (active_tool && ((active_tool->type == MOVE) ||
 			      !gimage_is_empty (gdisp->gimage)))
 	    if (active_tool->state == ACTIVE)
diff --git a/app/display/gimpdisplay-callbacks.c b/app/display/gimpdisplay-callbacks.c
index 11633bda49..5090fb8b40 100644
--- a/app/display/gimpdisplay-callbacks.c
+++ b/app/display/gimpdisplay-callbacks.c
@@ -182,6 +182,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
 	{
 	case 1:
 	  gtk_grab_remove (canvas);
+	  gdk_pointer_ungrab (bevent->time);  /* fixes pointer grab bug */
 	  if (active_tool && ((active_tool->type == MOVE) ||
 			      !gimage_is_empty (gdisp->gimage)))
 	    if (active_tool->state == ACTIVE)
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 11633bda49..5090fb8b40 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -182,6 +182,7 @@ gdisplay_canvas_events (GtkWidget *canvas,
 	{
 	case 1:
 	  gtk_grab_remove (canvas);
+	  gdk_pointer_ungrab (bevent->time);  /* fixes pointer grab bug */
 	  if (active_tool && ((active_tool->type == MOVE) ||
 			      !gimage_is_empty (gdisp->gimage)))
 	    if (active_tool->state == ACTIVE)