diff --git a/resources/assets/src/js/skinlib/index.js b/resources/assets/src/js/skinlib/index.js
index 4e9aeff0..8c2ef749 100644
--- a/resources/assets/src/js/skinlib/index.js
+++ b/resources/assets/src/js/skinlib/index.js
@@ -185,7 +185,11 @@ function onPageChange(page, type) {
 function updateUrlQueryString() {
     let query = $.param($.skinlib);
 
-    window.history.pushState(null, null, url(`skinlib?${query}`));
+    window.history.pushState(null, null, url(`skinlib?${ query }`));
+
+    $('li.locale').each(function () {
+        $(this).find('a').prop('href', `?lang=${ $(this).data('code') }&${ query }`);
+    });
 }
 
 function updateBreadCrumb() {
diff --git a/resources/views/common/language.tpl b/resources/views/common/language.tpl
index ddc12921..594a67b7 100644
--- a/resources/views/common/language.tpl
+++ b/resources/views/common/language.tpl
@@ -17,7 +17,7 @@
                         $link = $_SERVER['REQUEST_URI']."&lang=$code";
                     }
                 ?>
-                <li class="locale">
+                <li class="locale" data-code="{{ $code }}">
                     <a href="{{ $link }}">{{ $langInfo['name'] }}</a>
                 </li>
             @endif