diff --git a/functions.js b/functions.js
index 6ca221ace..3baaffa3a 100644
--- a/functions.js
+++ b/functions.js
@@ -2147,3 +2147,12 @@ function addLabel() {
 	}
 }
 
+function quickAddFeed() {
+	displayDlg('quickAddFeed', '',
+	   function () {$('feed_url').focus();});
+}
+
+function quickAddFilter() {
+	displayDlg('quickAddFilter', '',
+	   function () {document.forms['filter_add_form'].reg_exp.focus();});
+}
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 591597337..0ffecf116 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1177,10 +1177,10 @@
 				__('Search')."</button>
 			</div>";
 		
-		print "<button onclick=\"javascript:displayDlg('quickAddFeed')\">"
+		print "<button onclick=\"quickAddFeed()\">"
 			.__('Subscribe to feed')."</button> ";
 
-		print "<button onclick=\"javascript:editSelectedFeed()\">".
+		print "<button onclick=\"editSelectedFeed()\">".
 			__('Edit feeds')."</button> ";
 
 		if (get_pref($link, 'ENABLE_FEED_CATS')) {
diff --git a/modules/pref-filters.php b/modules/pref-filters.php
index 5c71fcb03..f3ca8e4cb 100644
--- a/modules/pref-filters.php
+++ b/modules/pref-filters.php
@@ -311,7 +311,7 @@
 			<img style='vertical-align : top;' src='".theme_image($link, "images/sign_quest.png")."'></a>
 		</div>";
 
-		print "<button onclick=\"return displayDlg('quickAddFilter', false)\">".
+		print "<button onclick=\"return quickAddFilter()\">".
 			__('Create filter')."</button> "; 
 
 		print "<button onclick=\"return editSelectedFilter()\">".
diff --git a/prefs.js b/prefs.js
index 018c62345..3212d0066 100644
--- a/prefs.js
+++ b/prefs.js
@@ -400,6 +400,7 @@ function editFeed(feed) {
 			parameters: query,
 			onComplete: function(transport) {
 					infobox_callback2(transport);
+					document.forms["edit_feed_form"].title.focus();
 				} });
 
 	} catch (e) {
@@ -1446,20 +1447,15 @@ function pref_hotkey_handler(e) {
 			hotkey_prefix = false;
 
 			if (keycode == 70) { // f
-				displayDlg("quickAddFilter");
+				quickAddFilter();
 				return false;
 			}
 
 			if (keycode == 83) { // s
-				displayDlg("quickAddFeed");
+				quickAddFeed();
 				return false;
 			}
 
-/*			if (keycode == 76) { // l
-				displayDlg("quickAddLabel");
-				return false;
-			} */
-
 			if (keycode == 85) { // u
 				// no-op
 			}
diff --git a/tt-rss.js b/tt-rss.js
index 5d62fb25b..233de669a 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -534,8 +534,7 @@ function quickMenuGo(opid) {
 		}
 	
 		if (opid == "qmcAddFeed") {
-			displayDlg('quickAddFeed', '',
-					   function () {$('feed_url').focus();});
+			quickAddFeed();
 			return;
 		}
 
@@ -791,6 +790,7 @@ function editFeedDlg(feed) {
 			parameters: query,
 			onComplete: function(transport) { 
 				infobox_callback2(transport); 
+				document.forms["edit_feed_form"].title.focus();
 			} });
 
 	} catch (e) {
@@ -1236,9 +1236,7 @@ function hotkey_handler(e) {
 			}
 
 			if (keycode == 83) { // s
-				displayDlg('quickAddFeed', '',
-					   function () {$('feed_url').focus();});
-
+				quickAddFeed();
 				return false;
 			}