diff --git a/amiga/gui.c b/amiga/gui.c
index 77a9ab2f3..0d99b9848 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1251,7 +1251,7 @@ void ami_handle_msg(void)
 							}
 							else
 							{
-								browser_window_mouse_drag_end(gwin->bw, 0, x, y);
+								browser_window_mouse_track(gwin->bw, 0, x, y);
 							}
 							gwin->mouse_state=0;
 						break;
@@ -1287,7 +1287,7 @@ void ami_handle_msg(void)
 							}
 							else
 							{
-								browser_window_mouse_drag_end(gwin->bw, 0, x, y);
+								browser_window_mouse_track(gwin->bw, 0, x, y);
 							}
 							gwin->mouse_state=0;
 						break;
diff --git a/atari/browser_win.c b/atari/browser_win.c
index a877c0562..ea8a23803 100755
--- a/atari/browser_win.c
+++ b/atari/browser_win.c
@@ -158,7 +158,8 @@ static void window_track_mouse_state( LGRECT * bwrect, bool within, short mx, sh
 					LOG(("Drag for %d ended", i));
 					bmstate &= ~( BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_1 ) ;
 					if( within ) {
-						browser_window_mouse_drag_end( 
+						/* drag end */
+						browser_window_mouse_track( 
 							gw->browser->bw, 0, nx, ny
 						);
 					}
@@ -167,7 +168,8 @@ static void window_track_mouse_state( LGRECT * bwrect, bool within, short mx, sh
 					bmstate &= ~( BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_2 ) ;
 					LOG(("Drag for %d ended", i));
 					if( within ) {
-						browser_window_mouse_drag_end( 
+						/* drag end */
+						browser_window_mouse_track( 
 							gw->browser->bw, 0, nx, ny
 						);
 					}
diff --git a/beos/beos_window.cpp b/beos/beos_window.cpp
index c617022a8..fc2c568e2 100644
--- a/beos/beos_window.cpp
+++ b/beos/beos_window.cpp
@@ -867,7 +867,7 @@ void nsbeos_dispatch_event(BMessage *message)
 					where.x / gui->bw->scale,
 					where.y / gui->bw->scale);
 			else 
-				browser_window_mouse_drag_end(gui->bw, (browser_mouse_state)0, 
+				browser_window_mouse_track(gui->bw, (browser_mouse_state)0, 
 					where.x, where.y);
 
 			gui->mouse.state = 0;
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index 3bfef1f21..624aded23 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -241,7 +241,7 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
 	
 	if (isDragging) {
 		isDragging = NO;
-		browser_window_mouse_drag_end( browser, modifierFlags, location.x, location.y );
+		browser_window_mouse_track( browser, (browser_mouse_state)0, location.x, location.y );
 	} else {
 		modifierFlags |= BROWSER_MOUSE_CLICK_1;
 		if ([theEvent clickCount] == 2) modifierFlags |= BROWSER_MOUSE_DOUBLE_CLICK;
diff --git a/gtk/window.c b/gtk/window.c
index 895e7998e..47e2a8dee 100644
--- a/gtk/window.c
+++ b/gtk/window.c
@@ -323,7 +323,7 @@ static gboolean nsgtk_window_button_release_event(GtkWidget *widget,
 				event->x / g->bw->scale,
 				event->y / g->bw->scale);
 	} else {
-		browser_window_mouse_drag_end(g->bw, 0, event->x / g->bw->scale,
+		browser_window_mouse_track(g->bw, 0, event->x / g->bw->scale,
 				event->y / g->bw->scale);
 	}
 
diff --git a/riscos/textselection.c b/riscos/textselection.c
index b5d88dca9..23b370a7e 100644
--- a/riscos/textselection.c
+++ b/riscos/textselection.c
@@ -183,7 +183,7 @@ void ro_gui_selection_drag_end(struct gui_window *g, wimp_dragged *drag)
 	}
 
 	if (ro_gui_window_to_window_pos(g, drag->final.x0, drag->final.y0, &pos))
-		browser_window_mouse_drag_end(g->bw, 0, pos.x, pos.y);
+		browser_window_mouse_track(g->bw, 0, pos.x, pos.y);
 }
 
 
diff --git a/riscos/window.c b/riscos/window.c
index 21573fcbd..2a727643e 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -3636,7 +3636,7 @@ void ro_gui_window_scroll_end(struct gui_window *g, wimp_dragged *drag)
 	}
 
 	if (ro_gui_window_to_window_pos(g, drag->final.x0, drag->final.y0, &pos))
-		browser_window_mouse_drag_end(g->bw, 0, pos.x, pos.y);
+		browser_window_mouse_track(g->bw, 0, pos.x, pos.y);
 }
 
 
diff --git a/windows/drawable.c b/windows/drawable.c
index 37f735ee3..5b2dea967 100644
--- a/windows/drawable.c
+++ b/windows/drawable.c
@@ -371,10 +371,10 @@ nsws_drawable_mouseup(struct gui_window *gw,
 					   (x + gw->scrollx) / gw->bw->scale,
 					   (y + gw->scrolly) / gw->bw->scale);
 	} else {
-		browser_window_mouse_drag_end(gw->bw,
-					      0,
-					      (x + gw->scrollx) / gw->bw->scale,
-					      (y + gw->scrolly) / gw->bw->scale);
+		browser_window_mouse_track(gw->bw,
+					   0,
+					   (x + gw->scrollx) / gw->bw->scale,
+					   (y + gw->scrolly) / gw->bw->scale);
 	}
 
 	gw->mouse->state = 0;