diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 9b15c675de..f5f1be2b2d 100644
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -648,8 +648,10 @@ void BufferView::Pimpl::workAreaButtonPress(int xpos, int ypos,
 		selection_possible = false;
 		owner_->updateLayoutChoice();
 		owner_->message(inset->editMessage());
+		// IMO the inset has to be first in edit-mode and then we send the
+		// button press. (Jug 20020222)
+		inset->edit(bv_); //, xpos, ypos, button);
 		inset->insetButtonPress(bv_, xpos, ypos, button);
-		inset->edit(bv_, xpos, ypos, button);
 		return;
 	} 
 	
diff --git a/src/ChangeLog b/src/ChangeLog
index eda9f40668..143d6f23ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-02-22  Juergen Vigna  <jug@sad.it>
 
+	* BufferView_pimpl.C (workAreaButtonPress): call edit() before calling
+	insetButtonPress for HIGHLY_EDITABLE_INSETS seems saner (fix #250).
+
 	* text.C (leftMargin): don't add an indent for paragraphs inside
 	tabular cells (fix #208).