diff --git a/src/webui/www/private/addtrackers.html b/src/webui/www/private/addtrackers.html
index 72f72282e..47901aa93 100644
--- a/src/webui/www/private/addtrackers.html
+++ b/src/webui/www/private/addtrackers.html
@@ -11,16 +11,23 @@
         'use strict';
 
         window.addEvent('domready', function() {
-            var setLocationKeyboardEvents = new Keyboard({
+            new Keyboard({
                 defaultEventType: 'keydown',
                 events: {
-                    'enter': function(event) {
+                    'Enter': function(event) {
                         $('addTrackersButton').click();
                         event.preventDefault();
+                    },
+                    'Escape': function(event) {
+                        window.parent.closeWindows();
+                        event.preventDefault();
+                    },
+                    'Esc': function(event) {
+                        window.parent.closeWindows();
+                        event.preventDefault();
                     }
                 }
-            });
-            setLocationKeyboardEvents.activate();
+            }).activate();
 
             $('trackersUrls').focus();
             $('addTrackersButton').addEvent('click', function(e) {
diff --git a/src/webui/www/private/downloadlimit.html b/src/webui/www/private/downloadlimit.html
index 5dc4066fd..aef12f5e2 100644
--- a/src/webui/www/private/downloadlimit.html
+++ b/src/webui/www/private/downloadlimit.html
@@ -55,10 +55,30 @@
                 }
             }
         </script>
-        <input type="button" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="setDlLimit()" />
+        <input type="button" id="applyButton" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="setDlLimit()" />
     </div>
 
     <script>
+        new Keyboard({
+            defaultEventType: 'keydown',
+            events: {
+                'Enter': function(event) {
+                    $('applyButton').click();
+                    event.preventDefault();
+                },
+                'Escape': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
+                },
+                'Esc': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
+                }
+            }
+        }).activate();
+
+        $('dllimitUpdatevalue').focus();
+
         MochaUI.addDlLimitSlider(hashes);
     </script>
 
diff --git a/src/webui/www/private/edittracker.html b/src/webui/www/private/edittracker.html
index 63b30e903..10f575a5c 100644
--- a/src/webui/www/private/edittracker.html
+++ b/src/webui/www/private/edittracker.html
@@ -11,16 +11,23 @@
         'use strict';
 
         window.addEvent('domready', function() {
-            var setLocationKeyboardEvents = new Keyboard({
+            new Keyboard({
                 defaultEventType: 'keydown',
                 events: {
-                    'enter': function(event) {
+                    'Enter': function(event) {
                         $('editTrackerButton').click();
                         event.preventDefault();
+                    },
+                    'Escape': function(event) {
+                        window.parent.closeWindows();
+                        event.preventDefault();
+                    },
+                    'Esc': function(event) {
+                        window.parent.closeWindows();
+                        event.preventDefault();
                     }
                 }
-            });
-            setLocationKeyboardEvents.activate();
+            }).activate();
 
             var currentUrl = new URI().getData('url');
             if (!currentUrl)
diff --git a/src/webui/www/private/installsearchplugin.html b/src/webui/www/private/installsearchplugin.html
index 7ea7b9d73..c2391bab3 100644
--- a/src/webui/www/private/installsearchplugin.html
+++ b/src/webui/www/private/installsearchplugin.html
@@ -30,10 +30,10 @@
     'use strict';
 
     var initInstallSearchPlugin = function() {
-        var installSearchPluginKeyboardEvents = new Keyboard({
+        new Keyboard({
             defaultEventType: 'keydown',
             events: {
-                'enter': function(e) {
+                'Enter': function(e) {
                     // accept enter key as a click
                     new Event(e).stop();
 
@@ -44,8 +44,7 @@
                         closeSearchWindow('installSearchPlugin');
                 }
             }
-        });
-        installSearchPluginKeyboardEvents.activate();
+        }).activate();
 
         $('newPluginPath').select();
     };
diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
index 8fcb87a41..18e205c61 100644
--- a/src/webui/www/private/newcategory.html
+++ b/src/webui/www/private/newcategory.html
@@ -11,16 +11,23 @@
     <script>
         'use strict';
 
-        var newCategoryKeyboardEvents = new Keyboard({
+        new Keyboard({
             defaultEventType: 'keydown',
             events: {
-                'enter': function(event) {
+                'Enter': function(event) {
                     $('categoryNameButton').click();
                     event.preventDefault();
+                },
+                'Escape': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
+                },
+                'Esc': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
                 }
             }
-        });
-        newCategoryKeyboardEvents.activate();
+        }).activate();
 
         window.addEvent('domready', function() {
             var uriAction = safeTrim(new URI().getData('action'));
@@ -28,10 +35,7 @@
             var uriCategoryName = safeTrim(new URI().getData('categoryName'));
             var uriSavePath = safeTrim(new URI().getData('savePath'));
 
-            if (uriAction === "create") {
-                $('categoryName').focus();
-            }
-            else if (uriAction === "edit") {
+            if (uriAction === "edit") {
                 if (!uriCategoryName)
                     return false;
 
@@ -40,6 +44,9 @@
                 $('savePath').set('value', escapeHtml(uriSavePath));
                 $('savePath').focus();
             }
+            else {
+                $('categoryName').focus();
+            }
 
             $('categoryNameButton').addEvent('click', function(e) {
                 new Event(e).stop();
diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
index 79db99b7e..4857e8388 100644
--- a/src/webui/www/private/rename.html
+++ b/src/webui/www/private/rename.html
@@ -11,16 +11,23 @@
     <script>
         'use strict';
 
-        var renameKeyboardEvents = new Keyboard({
+        new Keyboard({
             defaultEventType: 'keydown',
             events: {
-                'enter': function(event) {
+                'Enter': function(event) {
                     $('renameButton').click();
                     event.preventDefault();
+                },
+                'Escape': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
+                },
+                'Esc': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
                 }
             }
-        });
-        renameKeyboardEvents.activate();
+        }).activate();
 
         window.addEvent('domready', function() {
             var name = new URI().getData('name');
diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
index c98c4ac55..28df65ead 100644
--- a/src/webui/www/private/scripts/client.js
+++ b/src/webui/www/private/scripts/client.js
@@ -824,7 +824,7 @@ function setupCopyEventHandler() {
     });
 }
 
-var keyboardEvents = new Keyboard({
+new Keyboard({
     defaultEventType: 'keydown',
     events: {
         'ctrl+a': function(event) {
@@ -836,6 +836,4 @@ var keyboardEvents = new Keyboard({
             event.preventDefault();
         }
     }
-});
-
-keyboardEvents.activate();
+}).activate();
diff --git a/src/webui/www/private/search.html b/src/webui/www/private/search.html
index 1870d31d7..e158d9962 100644
--- a/src/webui/www/private/search.html
+++ b/src/webui/www/private/search.html
@@ -199,10 +199,10 @@
             }
         });
 
-        var searchKeyboardEvents = new Keyboard({
+        new Keyboard({
             defaultEventType: 'keydown',
             events: {
-                'enter': function(e) {
+                'Enter': function(e) {
                     // accept enter key as a click
                     new Event(e).stop();
 
@@ -228,8 +228,7 @@
                     }
                 }
             }
-        });
-        searchKeyboardEvents.activate();
+        }).activate();
     };
 
     var startSearch = function(pattern, category, plugins) {
diff --git a/src/webui/www/private/setlocation.html b/src/webui/www/private/setlocation.html
index 1b9e49741..baac5b713 100644
--- a/src/webui/www/private/setlocation.html
+++ b/src/webui/www/private/setlocation.html
@@ -11,16 +11,23 @@
     <script>
         'use strict';
 
-        var setLocationKeyboardEvents = new Keyboard({
+        new Keyboard({
             defaultEventType: 'keydown',
             events: {
-                'enter': function(event) {
+                'Enter': function(event) {
                     $('setLocationButton').click();
                     event.preventDefault();
+                },
+                'Escape': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
+                },
+                'Esc': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
                 }
             }
-        });
-        setLocationKeyboardEvents.activate();
+        }).activate();
 
         window.addEvent('domready', function() {
             var path = new URI().getData('path');
diff --git a/src/webui/www/private/shareratio.html b/src/webui/www/private/shareratio.html
index c24f4bad8..008a7e9cb 100644
--- a/src/webui/www/private/shareratio.html
+++ b/src/webui/www/private/shareratio.html
@@ -14,16 +14,23 @@
         var UseGlobalLimit = -2;
         var NoLimit = -1;
 
-        var keyboardEvents = new Keyboard({
+        new Keyboard({
             defaultEventType: 'keydown',
             events: {
-                'enter': function(event) {
+                'Enter': function(event) {
                     $('save').click();
                     event.preventDefault();
+                },
+                'Escape': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
+                },
+                'Esc': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
                 }
             }
-        });
-        keyboardEvents.activate();
+        }).activate();
 
         window.addEvent('domready', function() {
             var hashesList = new URI().getData('hashes').split('|');
diff --git a/src/webui/www/private/uploadlimit.html b/src/webui/www/private/uploadlimit.html
index 10fee6af3..6c9e1f873 100644
--- a/src/webui/www/private/uploadlimit.html
+++ b/src/webui/www/private/uploadlimit.html
@@ -55,10 +55,30 @@
                 }
             }
         </script>
-        <input type="button" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="setUpLimit()" />
+        <input type="button" id="applyButton" value="QBT_TR(Apply)QBT_TR[CONTEXT=HttpServer]" onclick="setUpLimit()" />
     </div>
 
     <script>
+        new Keyboard({
+            defaultEventType: 'keydown',
+            events: {
+                'Enter': function(event) {
+                    $('applyButton').click();
+                    event.preventDefault();
+                },
+                'Escape': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
+                },
+                'Esc': function(event) {
+                    window.parent.closeWindows();
+                    event.preventDefault();
+                }
+            }
+        }).activate();
+
+        $('uplimitUpdatevalue').focus();
+
         MochaUI.addUpLimitSlider(hashes);
     </script>