diff --git a/emhttp/plugins/dynamix.vm.manager/styles/dynamix.vm.manager.css b/emhttp/plugins/dynamix.vm.manager/styles/dynamix.vm.manager.css
index f7cf0abef1..f34b0c7b50 100644
--- a/emhttp/plugins/dynamix.vm.manager/styles/dynamix.vm.manager.css
+++ b/emhttp/plugins/dynamix.vm.manager/styles/dynamix.vm.manager.css
@@ -678,4 +678,4 @@ img.paused{opacity: 0.6;}
 .stopped{color:#EF3D47;}
 .paused{color:#F0DD33;}
 
-.log{cursor:zoom-in;}
+.log{cursor:zoom-in;}
\ No newline at end of file
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index c5eb5b66e6..94340d5d64 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -611,9 +611,17 @@
 			<?
 			echo mk_option($arrConfig['domain']['mem'], 128 * 1024, '128 MB');
 			echo mk_option($arrConfig['domain']['mem'], 256 * 1024, '256 MB');
+
 			for ($i = 1; $i <= ($maxmem*2); $i++) {
-				$label = ($i * 512).' MB';
-				$value = $i * 512 * 1024;
+				$sizeMB = $i * 512;
+				$value = $sizeMB * 1024;
+
+				if ($sizeMB >= 1024) {
+					$label = number_format($sizeMB / 1024, 1) . ' GB';
+				} else {
+					$label = $sizeMB . ' MB';
+				}
+
 				echo mk_option($arrConfig['domain']['mem'], $value, $label);
 			}
 			?>
@@ -623,9 +631,17 @@
 			<?
 			echo mk_option($arrConfig['domain']['maxmem'], 128 * 1024, '128 MB');
 			echo mk_option($arrConfig['domain']['maxmem'], 256 * 1024, '256 MB');
+
 			for ($i = 1; $i <= ($maxmem*2); $i++) {
-				$label = ($i * 512).' MB';
-				$value = $i * 512 * 1024;
+				$sizeMB = $i * 512;
+				$value = $sizeMB * 1024;
+
+				if ($sizeMB >= 1024) {
+					$label = number_format($sizeMB / 1024, 1) . ' GB';
+				} else {
+					$label = $sizeMB . ' MB';
+				}
+
 				echo mk_option($arrConfig['domain']['maxmem'], $value, $label);
 			}
 			?>
@@ -2876,4 +2892,4 @@ function(inputValue) {
 	regenerateDiskPreview();
 	resetForm();
 });
-</script>
+</script>
\ No newline at end of file