diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index ea2c0c0574..6786f3348c 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,5 +1,9 @@
 2006-05-22  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
+	* insettabular.C (doDispatch): do not mark the cursor undispatched
+	after mouse (button 3) press (prevents the cursor from leaving the 
+	tabular when opening the dialog).
+
 	* insettabular.C (doDispatch): fix crash due to invalidated
 	cursor after insertAciiString (bug 2603).
 
diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 7e334211f5..3ed7a227b2 100644
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -473,9 +473,6 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
 			break;
 		}
 
-		// we'll pop up the table dialog on release
-		if (cmd.button() == mouse_button::button3)
-			cur.undispatched();
 		break;
 
 	case LFUN_MOUSE_MOTION:
@@ -493,8 +490,10 @@ void InsetTabular::doDispatch(LCursor & cur, FuncRequest & cmd)
 
 	case LFUN_MOUSE_RELEASE:
 		//lyxerr << "# InsetTabular::MouseRelease\n" << bvcur << endl;
-		if (cmd.button() == mouse_button::button3)
+		if (cmd.button() == mouse_button::button3) {
+			bvcur.setCursor(cur);
 			InsetTabularMailer(*this).showDialog(&cur.bv());
+		}
 		break;
 
 	case LFUN_CELL_BACKWARD:
diff --git a/status.14x b/status.14x
index 6ea45bbc69..fb6afc6c11 100644
--- a/status.14x
+++ b/status.14x
@@ -92,6 +92,9 @@ What's new
 - When pasting contents to a tabular with the middle mouse button, the
   language has sometimes be changed. This is fixed now.
 
+- Fix unconditional movement of the cursor outside of a tabular when 
+  opening the tabular dialog.
+
 - Text copied from an ERT box has no longer the pseudo "latex" language
   (bug 2476).