diff --git a/app/log_viewer/app_languages.php b/app/log_viewer/app_languages.php
index 6719b49634..1f68136081 100644
--- a/app/log_viewer/app_languages.php
+++ b/app/log_viewer/app_languages.php
@@ -189,6 +189,33 @@ $text['label-size']['zh-cn'] = "KB";
 $text['label-size']['ja-jp'] = "KB";
 $text['label-size']['ko-kr'] = "KB";
 
+$text['label-max']['en-us'] = "Max";
+$text['label-max']['en-gb'] = "Max";
+$text['label-max']['ar-eg'] = "أقصى";
+$text['label-max']['de-at'] = "Maximal";
+$text['label-max']['de-ch'] = "Maximal";
+$text['label-max']['de-de'] = "Maximal";
+$text['label-max']['el-gr'] = "Μέγιστο";
+$text['label-max']['es-cl'] = "Máximo";
+$text['label-max']['es-mx'] = "Máximo";
+$text['label-max']['fr-ca'] = "Max";
+$text['label-max']['fr-fr'] = "Maximal";
+$text['label-max']['he-il'] = "מקסימום";
+$text['label-max']['it-it'] = "Massimo";
+$text['label-max']['ka-ge'] = "მაქს";
+$text['label-max']['nl-nl'] = "Maximaal";
+$text['label-max']['pl-pl'] = "Maksymalnie";
+$text['label-max']['pt-br'] = "Máximo";
+$text['label-max']['pt-pt'] = "Máximo";
+$text['label-max']['ro-ro'] = "Maxim";
+$text['label-max']['ru-ru'] = "Макс";
+$text['label-max']['sv-se'] = "Max";
+$text['label-max']['uk-ua'] = "Макс";
+$text['label-max']['tr-tr'] = "Maksimum";
+$text['label-max']['zh-cn'] = "最大";
+$text['label-max']['ja-jp'] = "最大";
+$text['label-max']['ko-kr'] = "최대";
+
 $text['label-log_file']['en-us'] = "Log file";
 $text['label-log_file']['en-gb'] = "Log file";
 $text['label-log_file']['ar-eg'] = "ملف تسجيل";
diff --git a/app/log_viewer/log_viewer.php b/app/log_viewer/log_viewer.php
index bb99eb2e02..a3d4e38627 100644
--- a/app/log_viewer/log_viewer.php
+++ b/app/log_viewer/log_viewer.php
@@ -141,6 +141,8 @@
 	echo 			"<option value='1024' ".($_POST['size'] == 1024 ? "selected='selected'" : null).">1024</option>";
 	echo 			"<option value='2048' ".($_POST['size'] == 2048 ? "selected='selected'" : null).">2048</option>";
 	echo 			"<option value='4096' ".($_POST['size'] == 4096 ? "selected='selected'" : null).">4096</option>";
+	echo 			"<option value='8192' ".($_POST['size'] == 8192 ? "selected='selected'" : null).">8192</option>";
+	echo 			"<option value='max' ".($_POST['size'] === 'max' ? "selected='selected'" : null).">" . $text['label-max'] . "</option>";
 	echo 		"</select> ";
 	echo 		$text['label-size'];
 	echo button::create(['type'=>'submit','label'=>$text['button-update'],'icon'=>$settings->get('theme', 'button_icon_save'),'style'=>'margin-left: 15px;','name'=>'submit']);
@@ -213,7 +215,11 @@
 
 		echo "<div style='padding-bottom: 10px; text-align: right; color: #fff; margin-bottom: 15px; border-bottom: 1px solid #fff;'>";
 		$user_file_size = '32768';
-		
+
+		if ($_POST['size'] === 'max') {
+			$_POST['size'] = $file_size;
+		}
+
 		if (!is_numeric($_POST['size'])) {
 			//should generate log warning here...
 			$user_file_size = 512 * 1024;