diff --git a/src/webui/www/private/rename.html b/src/webui/www/private/rename.html
index 2a8c9b925..5ba4b6c95 100644
--- a/src/webui/www/private/rename.html
+++ b/src/webui/www/private/rename.html
@@ -26,7 +26,7 @@
             var name = new URI().getData('name');
             // set text field to current value
             if (name)
-                $('rename').value = escapeHtml(name);
+                $('rename').value = escapeHtml(decodeURIComponent(name));
 
             $('rename').focus();
             $('renameButton').addEvent('click', function(e) {
diff --git a/src/webui/www/private/scripts/mocha-init.js b/src/webui/www/private/scripts/mocha-init.js
index 0ad123563..70a57e795 100644
--- a/src/webui/www/private/scripts/mocha-init.js
+++ b/src/webui/www/private/scripts/mocha-init.js
@@ -485,7 +485,7 @@ var initializeWindows = function() {
                     id: 'renamePage',
                     title: "QBT_TR(Rename)QBT_TR[CONTEXT=TransferListWidget]",
                     loadMethod: 'iframe',
-                    contentURL: 'rename.html?hash=' + hashes[0] + '&name=' + row.full_data.name,
+                    contentURL: 'rename.html?hash=' + hash + '&name=' + encodeURIComponent(row.full_data.name),
                     scrollbars: false,
                     resizable: false,
                     maximizable: false,