diff --git a/controllers/EditAsset.php b/controllers/EditAsset.php
index 930d01db..43545f00 100644
--- a/controllers/EditAsset.php
+++ b/controllers/EditAsset.php
@@ -86,6 +86,10 @@ class EditAsset extends HTMLController
 					$_POST['tag'][$_POST['id_album']] = true;
 				}
 			}
+			else
+			{
+				$_POST['tag'][$currentAlbumId] = true;
+			}
 
 			// Handle tags
 			$new_tags = [];
diff --git a/templates/EditAssetForm.php b/templates/EditAssetForm.php
index 8bc2f5b8..4fcecdb2 100644
--- a/templates/EditAssetForm.php
+++ b/templates/EditAssetForm.php
@@ -123,11 +123,16 @@ class EditAssetForm extends Template
 					<ul class="list-unstyled" id="tag_list">';
 
 		foreach ($this->asset->getTags() as $tag)
-				echo '
+		{
+			if ($tag->kind === 'Album')
+				continue;
+
+			echo '
 						<li>
 							<input class="tag_check" type="checkbox" name="tag[', $tag->id_tag, ']" id="linked_tag_', $tag->id_tag, '" title="Uncheck to delete" checked>
 							', $tag->tag, '
 						</li>';
+		}
 
 		echo '
 						<li id="new_tag_container"><input class="form-control" type="text" id="new_tag" placeholder="Type to link a new tag"></li>