diff --git a/GrocyDbMigrator.php b/GrocyDbMigrator.php
index 35e23ee1..81dc9e61 100644
--- a/GrocyDbMigrator.php
+++ b/GrocyDbMigrator.php
@@ -160,6 +160,32 @@ class GrocyDbMigrator
 			GROUP BY battery_id
 			ORDER BY MAX(tracked_time) DESC;"
 		);
+
+		self::ExecuteMigrationWhenNeeded($pdo, 16, "
+			ALTER TABLE shopping_list RENAME TO shopping_list_old;"
+		);
+
+		self::ExecuteMigrationWhenNeeded($pdo, 17, "
+			CREATE TABLE shopping_list (
+				id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+				product_id INTEGER,
+				note TEXT,
+				amount INTEGER NOT NULL DEFAULT 0,
+				amount_autoadded INTEGER NOT NULL DEFAULT 0,
+				row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+			)"
+		);
+
+		self::ExecuteMigrationWhenNeeded($pdo, 18, "
+			INSERT INTO shopping_list
+				(product_id, amount, amount_autoadded, row_created_timestamp)
+			SELECT product_id, amount, amount_autoadded, row_created_timestamp
+			FROM shopping_list_old"
+		);
+
+		self::ExecuteMigrationWhenNeeded($pdo, 19, "
+			DROP TABLE shopping_list_old;"
+		);
 	}
 
 	private static function ExecuteMigrationWhenNeeded(PDO $pdo, int $migrationId, string $sql)
diff --git a/views/shoppinglist.php b/views/shoppinglist.php
index 5dba5ccf..e0718d88 100644
--- a/views/shoppinglist.php
+++ b/views/shoppinglist.php
@@ -17,6 +17,7 @@
 					<th>#</th>
 					<th>Product</th>
 					<th>Amount</th>
+					<th>Note</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -31,10 +32,13 @@
 						</a>
 					</td>
 					<td>
-						<?php echo GrocyPhpHelper::FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name; ?>
+						<?php if (!empty($listItem->product_id)) echo GrocyPhpHelper::FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name; ?>
 					</td>
 					<td>
-						<?php echo $listItem->amount + $listItem->amount_autoadded . ' ' . GrocyPhpHelper::FindObjectInArrayByPropertyValue($quantityunits, 'id', GrocyPhpHelper::FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name; ?>
+						<?php echo $listItem->amount + $listItem->amount_autoadded; if (!empty($listItem->product_id)) echo ' ' . GrocyPhpHelper::FindObjectInArrayByPropertyValue($quantityunits, 'id', GrocyPhpHelper::FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name; ?>
+					</td>
+					<td>
+						<?php echo $listItem->note; ?>
 					</td>
 				</tr>
 				<?php endforeach; ?>
diff --git a/views/shoppinglistform.php b/views/shoppinglistform.php
index 37de5e67..93e6a512 100644
--- a/views/shoppinglistform.php
+++ b/views/shoppinglistform.php
@@ -12,7 +12,7 @@
 
 		<div class="form-group">
 			<label for="product_id">Product&nbsp;&nbsp;<i class="fa fa-barcode"></i></label>
-			<select class="form-control combobox" id="product_id" name="product_id" value="<?php if ($mode == 'edit') echo $listItem->product_id; ?>" required>
+			<select class="form-control combobox" id="product_id" name="product_id" value="<?php if ($mode == 'edit') echo $listItem->product_id; ?>">
 				<option value=""></option>
 				<?php foreach ($products as $product) : ?>
 					<option <?php if ($mode == 'edit' && $product->id == $listItem->product_id) echo 'selected="selected"'; ?> data-additional-searchdata="<?php echo $product->barcode; ?>" value="<?php echo $product->id; ?>"><?php echo $product->name; ?></option>
@@ -22,11 +22,16 @@
 		</div>
 
 		<div class="form-group">
-			<label for="amount">Amount&nbsp;&nbsp;<span id="amount_qu_unit" class="small text-muted"></span></label>
-			<input type="number" class="form-control" id="amount" name="amount" value="<?php if ($mode == 'edit') echo $listItem->amount; else echo '1'; ?>" min="1" required>
+			<label for="amount">Amount&nbsp;&nbsp;<span id="amount_qu_unit" class="small text-muted"></span><br><span class="small text-warning"><?php if ($mode == 'edit' && $listItem->amount_autoadded > 0) echo $listItem->amount_autoadded . " units were automatically added and will apply in addition to the amount entered here."; ?></span></label>
+			<input type="number" class="form-control" id="amount" name="amount" value="<?php if ($mode == 'edit') echo $listItem->amount; else echo '1'; ?>" min="0" required>
 			<div class="help-block with-errors"></div>
 		</div>
 
+		<div class="form-group">
+			<label for="note">Note</label>
+			<textarea class="form-control" rows="2" id="note" name="note"><?php if ($mode == 'edit') echo $listItem->note; ?></textarea>
+		</div>
+
 		<button id="save-shoppinglist-button" type="submit" class="btn btn-default">Save</button>
 
 	</form>