diff --git a/app/controllers/admin/system_info_controller.rb b/app/controllers/admin/system_info_controller.rb
index a548f941dc564052dcbf1cd3e01359e7251e0bc8..ab05ed2612a759aae502796c40fd5d77445415b2 100644
--- a/app/controllers/admin/system_info_controller.rb
+++ b/app/controllers/admin/system_info_controller.rb
@@ -3,10 +3,10 @@ class Admin::SystemInfoController < Admin::ApplicationController
     system_info = Vmstat.snapshot
     @load = system_info.load_average.collect { |v| v.round(2) }.join(', ')
 
-    @mem_used = Filesize.from("#{system_info.memory.active_bytes} B").to_s('GB')
-    @mem_total = Filesize.from("#{system_info.memory.total_bytes} B").to_s('GB')
+    @mem_used = Filesize.from("#{system_info.memory.active_bytes} B").to_f('GB').round
+    @mem_total = Filesize.from("#{system_info.memory.total_bytes} B").to_f('GB').round
 
-    @disk_used = Filesize.from("#{system_info.disks[0].used_bytes} B").to_s('GB')
-    @disk_total = Filesize.from("#{system_info.disks[0].total_bytes} B").to_s('GB')
+    @disk_used = Filesize.from("#{system_info.disks[0].used_bytes} B").to_f('GB').round
+    @disk_total = Filesize.from("#{system_info.disks[0].total_bytes} B").to_f('GB').round
   end
 end
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 2a1fac6e48b76819063a3d5806e46dcae712a389..316a94f4d4166eae2601a4aef0f2e50a3baf8936 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -14,9 +14,9 @@
       .light-well
         %h4 Memory
         .data
-          %h1= "#{@mem_used} / #{@mem_total}"
+          %h1= "#{@mem_used}GB / #{@mem_total}GB"
     .col-sm-4
       .light-well
         %h4 Disk
         .data
-          %h1= "#{@disk_used} / #{@disk_total}"
+          %h1= "#{@disk_used}GB / #{@disk_total}GB"