diff --git a/plugins/swap/index.py b/plugins/swap/index.py
index c3fd1fd19..cf4c36b3d 100755
--- a/plugins/swap/index.py
+++ b/plugins/swap/index.py
@@ -168,7 +168,11 @@ def initdUinstall():
 
 def swapStatus():
     sfile = getServerDir() + '/swapfile'
-    size = os.path.getsize(sfile) / 1024 / 1024
+
+    if os.path.exists(sfile):
+        size = os.path.getsize(sfile) / 1024 / 1024
+    else:
+        size = '218'
     data = {'size': size}
     return mw.returnJson(True, "ok", data)
 
diff --git a/plugins/swap/js/swap.js b/plugins/swap/js/swap.js
index dc6ac90a2..a78e2db07 100755
--- a/plugins/swap/js/swap.js
+++ b/plugins/swap/js/swap.js
@@ -52,9 +52,14 @@ function swapStatus() {
         $(".soft-man-con").html(spCon);
 
         $(".conf_p select[name='swap_set']").change(function() {
-            var size = $(this).val();
-            $("input[name='cur_size']").val(size);
-            $("input[name='size']").val(size);
+            var swap_size = $(this).val();
+            if (swap_size.indexOf('GB')>-1){
+                swap_size = parseInt(swap_size)*1024;
+            } else{
+                swap_size = parseInt(swap_size);
+            }
+            $("input[name='cur_size']").val(swap_size);
+            $("input[name='size']").val(swap_size);
         });
     });
 }