diff --git a/ChangeLog b/ChangeLog
index a41259c64..dc92615a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003-10-21  Alex Roitman  <shura@alex.neuro.umn.edu>
+	* src/MediaView.py: Correct behavior for right-click popup menu.
+
 2003-10-20  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/gramps.glade: widen the ChildSelect window
 	* src/SelectPerson.py: sort people before adding to list
diff --git a/src/MediaView.py b/src/MediaView.py
index 25cd8bb11..95050c5f3 100644
--- a/src/MediaView.py
+++ b/src/MediaView.py
@@ -174,11 +174,11 @@ class MediaView:
             self.on_edit_clicked(obj)
             return 1
         elif event.button == 3:
-            self.build_context_menu()
+            self.build_context_menu(event)
             return 1
         return 0
 
-    def build_context_menu(self):
+    def build_context_menu(self,event):
         menu = gtk.Menu()
         menu.set_title(_("Media Object"))
 
@@ -214,7 +214,7 @@ class MediaView:
             item.set_sensitive(sensitivity)
             item.show()
             menu.append(item)
-        menu.popup(None,None,None,0,0)
+        menu.popup(None,None,None,event.button,event.time)
 
     def popup_view_photo(self, obj):
         Utils.view_photo(self.obj)