diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index bd39a47a7..5595def2b 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -256,12 +256,22 @@ class FileHandler
 			return $size . 'Bytes';
 		}
 
-		if($size >= 1024 && $size < 1024 * 1024)
+		if($size >= 1024 && $size < (1024 * 1024))
 		{
 			return sprintf("%0.1fKB", $size / 1024);
 		}
 
-		return sprintf("%0.2fMB", $size / (1024 * 1024));
+		if($size >= (1024 * 1024) && $size < (1024 * 1024 * 1024))
+		{
+			return sprintf("%0.2fMB", $size / (1024 * 1024));
+		}
+
+		if($size >= (1024 * 1024 * 1024) && $size < (1024 * 1024 * 1024 * 1024))
+		{
+			return sprintf("%0.2fGB", $size / (1024 * 1024 * 1024));
+		}
+
+		return sprintf("%0.2fTB", $size / (1024 * 1024 * 1024 * 1024));
 	}
 
 	/**