diff --git a/resources/views/vendor/language.tpl b/resources/views/vendor/language.tpl
index 80fb447c..88ab9b9f 100644
--- a/resources/views/vendor/language.tpl
+++ b/resources/views/vendor/language.tpl
@@ -8,7 +8,11 @@
     <ul class="dropdown-menu" role="menu">
         @foreach(config('locales') as $code => $langInfo)
             @if (!isset($langInfo['alias']))
-                <li class="locale"><a href="?lang={{ $code }}">{{ $langInfo['name'] }}</a></li>
+                @if (count($_GET) == 0 || (count($_GET) == 1 && isset($_GET['lang'])))
+                    <li class="locale"><a href="?lang={{ $code }}">{{ $langInfo['name'] }}</a></li>
+                @else
+                    <li class="locale"><a href="{{ $_SERVER['REQUEST_URI'] }}&lang={{ $code }}">{{ $langInfo['name'] }}</a></li>
+                @endif
             @endif
         @endforeach
     </ul>