diff --git a/deluge/ui/web/js/deluge-all/TorrentGrid.js b/deluge/ui/web/js/deluge-all/TorrentGrid.js
index f22286ace..2a468f0bc 100644
--- a/deluge/ui/web/js/deluge-all/TorrentGrid.js
+++ b/deluge/ui/web/js/deluge-all/TorrentGrid.js
@@ -256,14 +256,7 @@ Ext.define('Deluge.TorrentGrid', {
         deluge.events.on('torrentRemoved', this.onTorrentRemoved, this);
         deluge.events.on('disconnect', this.onDisconnect, this);
 
-        this.on('rowcontextmenu', function(grid, rowIndex, e) {
-            e.stopEvent();
-            var selection = grid.getSelectionModel();
-            if (!selection.hasSelection()) {
-                selection.selectRow(rowIndex);
-            }
-            deluge.menus.torrent.showAt(e.getPoint());
-        });
+        this.on('itemcontextmenu', this.onTorrentSelected, this);
     },
 
     /**
@@ -374,5 +367,15 @@ Ext.define('Deluge.TorrentGrid', {
             this.getStore().remove(record);
             delete this.torrents[torrentId];
         }, this);
+    },
+
+    onTorrentSelected: function(grid, record, item, i, e, opts) {
+        e.stopEvent();
+        var sm = grid.getSelectionModel();
+        if (!sm.hasSelection()) {
+            sm.select(record);
+        }
+        var point = e.getPoint();
+        deluge.menus.torrent.showAt(point.x, point.y);
     }
 });