diff --git a/deluge/plugins/label/label/core.py b/deluge/plugins/label/label/core.py
index 615d8284e..5272e7509 100644
--- a/deluge/plugins/label/label/core.py
+++ b/deluge/plugins/label/label/core.py
@@ -127,7 +127,9 @@ class Core(CorePluginBase):
         pass
 
     def init_filter_dict(self):
-        return dict( [(label, 0) for label in self.labels.keys()])
+        filter_dict = dict([(label, 0) for label in self.labels.keys()])
+        filter_dict['All'] = len(self.torrents.keys())
+        return filter_dict
 
     ## Plugin hooks ##
     def post_torrent_add(self, torrent_id):
diff --git a/deluge/plugins/label/label/data/label.js b/deluge/plugins/label/label/data/label.js
index 8ae0584bc..dfbf269f1 100644
--- a/deluge/plugins/label/label/data/label.js
+++ b/deluge/plugins/label/label/data/label.js
@@ -426,7 +426,7 @@ Deluge.plugins.LabelPlugin = Ext.extend(Deluge.Plugin, {
 
 		var lbltpl = '<div class="x-deluge-filter">' +
 						'<tpl if="filter">{filter}</tpl>' +
-						'<tpl if="!filter">no label</tpl>' +
+						'<tpl if="!filter">No Label</tpl>' +
 						' ({count})' +
 					'</div>';