diff --git a/controllers/EditAlbum.php b/controllers/EditAlbum.php
index 2d716dec..73affff0 100644
--- a/controllers/EditAlbum.php
+++ b/controllers/EditAlbum.php
@@ -139,6 +139,13 @@ class EditAlbum extends HTMLController
 				];
 			}
 		}
+		elseif (empty($_POST) && count($parentChoices) > 1)
+		{
+			// Choose the first non-root album as the default parent
+			reset($parentChoices);
+			next($parentChoices);
+			$formDefaults = ['id_parent' => key($parentChoices)];
+		}
 
 		if (!isset($formDefaults))
 			$formDefaults = isset($album) ? get_object_vars($album) : $_POST;