diff --git a/public/js/legacy/widgets/form/form.js b/public/js/legacy/widgets/form/form.js
index c2e87293f4..92f8759450 100644
--- a/public/js/legacy/widgets/form/form.js
+++ b/public/js/legacy/widgets/form/form.js
@@ -859,7 +859,7 @@ _f.Frm.prototype.save = function(save_action, call_back) {
 
 		if(call_back){
 			call_back(r);
-		}
+		}		
 	}
 
 	var me = this;
diff --git a/public/js/legacy/widgets/form/form_header.js b/public/js/legacy/widgets/form/form_header.js
index be06eada5c..280f4e689e 100644
--- a/public/js/legacy/widgets/form/form_header.js
+++ b/public/js/legacy/widgets/form/form_header.js
@@ -107,7 +107,7 @@ _f.FrmHeader = Class.extend({
 		// Save
 		if(docstatus==0 && p[WRITE]) {
 			this.appframe.add_button('Save', function() { cur_frm.save('Save');}, '');
-			this.appframe.buttons['Save'].addClass('btn-info');			
+			this.appframe.buttons['Save'].addClass('btn-info').text("Save (Ctrl+S)");			
 		}
 		// Submit
 		if(docstatus==0 && p[SUBMIT] && (!cur_frm.doc.__islocal))
diff --git a/public/js/wn/ui/listing.js b/public/js/wn/ui/listing.js
index 92f7163741..f636d59ab4 100644
--- a/public/js/wn/ui/listing.js
+++ b/public/js/wn/ui/listing.js
@@ -288,6 +288,8 @@ wn.ui.Listing = Class.extend({
 	render_list: function(values) {		
 		var m = Math.min(values.length, this.page_length);
 		this.data = values;
+		if(this.filter_list)
+			this.filter_values = this.filter_list.get_filters();
 		
 		// render the rows
 		for(var i=0; i < m; i++) {
diff --git a/public/js/wn/ui/toolbar/search.js b/public/js/wn/ui/toolbar/search.js
index 477ef175bc..bd6c897d76 100644
--- a/public/js/wn/ui/toolbar/search.js
+++ b/public/js/wn/ui/toolbar/search.js
@@ -29,6 +29,7 @@ wn.ui.toolbar.Search = wn.ui.toolbar.SelectorDialog.extend({
 			execute: function(val) {
 				new wn.ui.Search({doctype:val});
 			},
+			help: "Shortcut: Ctrl+G"
 		});
 		
 		// get new types
diff --git a/public/js/wn/ui/toolbar/selector_dialog.js b/public/js/wn/ui/toolbar/selector_dialog.js
index a10d53e737..ca680ccd91 100644
--- a/public/js/wn/ui/toolbar/selector_dialog.js
+++ b/public/js/wn/ui/toolbar/selector_dialog.js
@@ -49,6 +49,9 @@ wn.ui.toolbar.SelectorDialog = Class.extend({
 				{fieldtype:'Button', label:'Go', fieldname:'go'}
 			]
 		});
+		if(this.opts.help) {
+			$("<div class='help'>"+this.opts.help+"</div>").appendTo(this.dialog.body);
+		}
 	},
 	bind_events: function() {
 		var me = this;