diff --git a/ChangeLog b/ChangeLog
index a4923437ca..4293b86ea0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ phpMyAdmin - ChangeLog
 - issue #12405 Use single quotes in PHP code
 - issue #12534 Option for the dropped column is not removed from 'after_field' select, after the column is dropped
 - issue #12531 Properly detect DROP DATABASE queries
+- issue #12470 Fix possible race condition in setting URL hash
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29
diff --git a/js/config.js b/js/config.js
index 6630dd6c7c..d3d0c5f840 100644
--- a/js/config.js
+++ b/js/config.js
@@ -588,8 +588,9 @@ function setTab(tab_id)
         }
         $this.find('li').removeClass('active').find('a[href=#' + tab_id + ']').parent().addClass('active');
         $this.parent().find('div.tabs_contents fieldset').hide().filter('#' + tab_id).show();
-        location.hash = 'tab_' + tab_id;
-        $this.parent().find('input[name=tab_hash]').val(location.hash);
+        var hashValue = 'tab_' + tab_id;
+        location.hash = hashValue;
+        $this.parent().find('input[name=tab_hash]').val(hashValue);
     });
 }