diff --git a/mobile/tail.php b/mobile/tail.php
index 1ef67d14b..a61813865 100644
--- a/mobile/tail.php
+++ b/mobile/tail.php
@@ -40,7 +40,27 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     </div>
 </footer>
 
-<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.str_replace("&", "&amp;", $_SERVER['QUERY_STRING']).'&amp;':'?').'device=pc'; ?>" id="device_change">PC 버전으로 보기</a>
+<?php
+$seq = 0;
+$href = $_SERVER['PHP_SELF'];
+if($_SERVER['QUERY_STRING']) {
+    $sep = '?';
+    foreach($_GET as $key=>$val) {
+        if($key == 'device')
+            continue;
+
+        $href .= $sep.$key.'='.$val;
+        $sep = '&amp;';
+        $seq++;
+    }
+}
+if($seq)
+    $href .= '&amp;device=pc';
+else
+    $href .= '?device=pc';
+?>
+
+<a href="<?php echo $href; ?>" id="device_change">PC 버전으로 보기</a>
 
 <?php
 include_once(G4_PATH."/tail.sub.php");
diff --git a/tail.php b/tail.php
index e33306e94..39d7e60e9 100644
--- a/tail.php
+++ b/tail.php
@@ -34,9 +34,30 @@ if ($config['cf_include_tail']) {
     </div>
 </div>
 
-<?php if(!G4_IS_MOBILE) { ?>
-<a href="<?php echo $_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING']?'?'.str_replace("&", "&amp;", $_SERVER['QUERY_STRING']).'&amp;':'?').'device=mobile'; ?>" id="device_change">모바일 버전으로 보기</a>
-<?php } ?>
+<?php
+if(!G4_IS_MOBILE) {
+    $seq = 0;
+    $href = $_SERVER['PHP_SELF'];
+    if($_SERVER['QUERY_STRING']) {
+        $sep = '?';
+        foreach($_GET as $key=>$val) {
+            if($key == 'device')
+                continue;
+
+            $href .= $sep.$key.'='.$val;
+            $sep = '&amp;';
+            $seq++;
+        }
+    }
+    if($seq)
+        $href .= '&amp;device=mobile';
+    else
+        $href .= '?device=mobile';
+?>
+<a href="<?php echo $href; ?>" id="device_change">모바일 버전으로 보기</a>
+<?php
+}
+?>
 
 <!-- } 하단 끝 -->