diff -r 33310803546c -r 8f04006214dc mapeditor.cpp
--- a/mapeditor.cpp	Mon May 15 07:32:10 2006 +0000
+++ b/mapeditor.cpp	Mon May 15 07:32:11 2006 +0000
@@ -3189,16 +3189,26 @@
 		updateActions();
 		canvasContextMenu->popup(e->globalPos() );
     } 
+	e->accept();
 }
 
 void MapEditor::contentsMousePressEvent(QMouseEvent* e)
 {
+	// Ignore right clicks, these will go to context menus
+	if (e->button() == QMouseEvent::RightButton )
+	{
+		e->ignore();
+		return;
+	}
+
 	// Finish open lineEdits
 	if (lineedit) finishedLineEdit();
 	
     QPoint p = inverseWorldMatrix().map(e->pos());
     LinkableMapObj* lmo=mapCenter->findMapObj(p, NULL);
 	
+	e->accept();
+
 	//Take care of clickdesystem flags _or_ modifier modes
 	//
 	if (lmo && (typeid(*lmo)==typeid(BranchObj) ||