diff --git a/head.sub.php b/head.sub.php
index 59b191974..50917e9f7 100644
--- a/head.sub.php
+++ b/head.sub.php
@@ -81,7 +81,7 @@ if ($is_admin) {
 <script src="<?php echo G5_JS_URL ?>/wrest.js"></script>
 <?php
 if(G5_IS_MOBILE) {
-    echo '<script> set_cookie("device_width", screen.width, 6, g5_cookie_domain); </script>'.PHP_EOL;
+    echo '<script> set_cookie("device_width", $(window).width(), 6, g5_cookie_domain); </script>'.PHP_EOL;
     echo '<script src="'.G5_JS_URL.'/modernizr.custom.70111.js"></script>'.PHP_EOL; // overflow scroll 감지
 }
 //if(!defined('G5_IS_ADMIN'))
diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index 07198589c..e6f7b05ff 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -86,12 +86,16 @@ function get_view_thumbnail($contents, $thumb_width=0)
             // 썸네일 width 설정
             $thumb_width = 320;
 
-            if($dvc_width >= 1000) {
-                return $contents;
-            } else if($dvc_width >= 760 && $dvc_width < 1000) {
-                $thumb_width = 760;
-            } else if($dvc_width >= 480 && $dvc_width < 760) {
-                $thumb_width = 480;
+            if($dvc_width > $board['bo_image_width']) {
+                $thumb_width = $board['bo_image_width'];
+            } else {
+                if($dvc_width >= 1000) {
+                    $thumb_width = 1000;
+                } else if($dvc_width >= 760 && $dvc_width < 1000) {
+                    $thumb_width = 760;
+                } else if($dvc_width >= 480 && $dvc_width < 760) {
+                    $thumb_width = 480;
+                }
             }
         } else {
             $thumb_width = $board['bo_image_width'];