diff --git a/deluge/ui/web/js/deluge-torrents.js b/deluge/ui/web/js/deluge-torrents.js
index cd1dad482..ca55c7504 100644
--- a/deluge/ui/web/js/deluge-torrents.js
+++ b/deluge/ui/web/js/deluge-torrents.js
@@ -125,6 +125,10 @@ Deluge.Torrents.Grid = new Ext.grid.GridPanel({
 		'rowcontextmenu': {
 			fn: function(grid, rowIndex, e) {
 				e.stopEvent();
+				var selection = grid.getSelectionModel();
+				if (!selection.hasSelection()) {
+					selection.selectRow(rowIndex);
+				}
 				Deluge.Menus.Torrent.showAt(e.getPoint());
 			}
 		}