diff --git a/CHANGELOG b/CHANGELOG
index 9cc1d15ade..1b2ab4ef5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -28,6 +28,7 @@ Version 1.1.13 work in progress
 - Bug #1485 CSort does not quote table alias when using CDbCriteria (undsoft)
 - Bug #1499: Fixed CVarDumper highlighting "\" (antoncpu)
 - Bug #1552: Fixed potential vulnerability in CJavaScript::encode(): $safe parameter didn't used to be passed to the recursive method calls (resurtm)
+- Bug #1584: Fixed CGridView urls when enableHistory was used with "path" urlFormat (mdomba)
 - Bug: Table schema is refreshed on Gii model generation when schemaCachingDuration is used (SonkoDmitry)
 - Bug: CDbCommand::setFetchMode wasn't accepting additional arguments needed for PDO::FETCH_CLASS (samdark)
 - Enh #84: Log route categories are now accepted in form of array. Added CLogRoute::except and parameter to CLogRoute::getLogs that allows you to exclude specific categories (paystey)
diff --git a/framework/zii/widgets/assets/gridview/jquery.yiigridview.js b/framework/zii/widgets/assets/gridview/jquery.yiigridview.js
index 825e41fd0d..4bb4538903 100644
--- a/framework/zii/widgets/assets/gridview/jquery.yiigridview.js
+++ b/framework/zii/widgets/assets/gridview/jquery.yiigridview.js
@@ -84,11 +84,11 @@
 						// Check to see if History.js is enabled for our Browser
 						if (settings.enableHistory && window.History.enabled) {
 							// Ajaxify this link
-							var url = $(this).attr('href'),
-								params = $.deparam.querystring(url);
+							var url = $(this).attr('href').split('?'),
+								params = $.deparam.querystring('?'+url[1]);
 
 							delete params[settings.ajaxVar];
-							window.History.pushState(null, document.title, decodeURIComponent($.param.querystring(url.substr(0, url.indexOf('?')), params)));
+							window.History.pushState(null, document.title, decodeURIComponent($.param.querystring(url[0], params)));
 						} else {
 							$('#' + id).yiiGridView('update', {url: $(this).attr('href')});
 						}