diff --git a/ChangeLog b/ChangeLog
index 6258f6dc0..713482eee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,7 @@ Deluge 0.9.04 - "1.0.0_RC4" (In Development)
   * Fix building with gcc 4.3
 
  GtkUI:
-  * Fix selecting torrents when right-clicking on them, behaviour is now similar
-     to Nautilus
+  * Fix selecting torrents when right-clicking on them in torrentview and filestab
   * Fix new release check
   * Display 'total_wanted' instead of 'total_size' in Size column
   
diff --git a/deluge/ui/gtkui/files_tab.py b/deluge/ui/gtkui/files_tab.py
index 474e99919..b883e8cce 100644
--- a/deluge/ui/gtkui/files_tab.py
+++ b/deluge/ui/gtkui/files_tab.py
@@ -377,7 +377,20 @@ class FilesTab(Tab):
         """This is a callback for showing the right-click context menu."""
         log.debug("on_button_press_event")
         # We only care about right-clicks
-        if self.get_selected_files() and event.button == 3:
+        if event.button == 3:
+            x, y = event.get_coords()
+            path = self.listview.get_path_at_pos(int(x), int(y))
+            if not path:
+                return
+            row = self.treestore.get_iter(path[0])
+
+            if self.get_selected_files():
+                if self.treestore.get_value(row, 5) not in self.get_selected_files():
+                    self.listview.get_selection().unselect_all()
+                    self.listview.get_selection().select_iter(row)
+            else:
+                self.listview.get_selection().select_iter(row)
+            
             self.file_menu.popup(None, None, None, event.button, event.time)
             return True