diff --git a/deluge/ui/webui/static/deluge.js b/deluge/ui/webui/static/deluge.js
index 87348f993..8bd032d64 100644
--- a/deluge/ui/webui/static/deluge.js
+++ b/deluge/ui/webui/static/deluge.js
@@ -97,6 +97,14 @@ function deselect_all_rows(){
 	}
 }
 
+function select_all_rows(){
+    torrents = torrent_table.torrents
+	for (i in torrents){
+		select_row(torrents[i]);
+	}
+}
+
+
 function reselect_rows(){
 	var selected = false;
 	var selected_rows = getCookie('selected_rows').split(',');
diff --git a/deluge/ui/webui/static/images/tango/select-all.png b/deluge/ui/webui/static/images/tango/select-all.png
new file mode 100644
index 000000000..e31e754df
Binary files /dev/null and b/deluge/ui/webui/static/images/tango/select-all.png differ
diff --git a/deluge/ui/webui/templates/white/part_toolbar.html b/deluge/ui/webui/templates/white/part_toolbar.html
index 2c8ff9cb2..0dd5d30a6 100644
--- a/deluge/ui/webui/templates/white/part_toolbar.html
+++ b/deluge/ui/webui/templates/white/part_toolbar.html
@@ -4,3 +4,10 @@ $for id, title, image, flag, method, url, important in toolbar_items:
         onclick='toolbar_$(method.lower()) ("$base$url",$flag)'
         title='$title'><img class='toolbar_btn'
         src='$base/static/images/tango/$image'></a>
+
+        <a class='toolbar_btn' href="#"
+        onclick='select_all_rows()'
+        title='$_("Select All")'><img class='toolbar_btn'
+        src='$base/static/images/tango/select-all.png'></a>
+
+