diff --git a/templates/AlbumIndex.php b/templates/AlbumIndex.php
index 4307fb77..1e477ab8 100644
--- a/templates/AlbumIndex.php
+++ b/templates/AlbumIndex.php
@@ -35,8 +35,12 @@ class AlbumIndex extends SubTemplate
 
 			foreach ($photos as $album)
 			{
+				$color = isset($album['thumbnail']) ? $album['thumbnail']->bestColor() : 'ccc';
+				if ($color == 'FFFFFF')
+					$color = 'ccc';
+
 				echo '
-						<div class="landscape">';
+						<div class="landscape" style="border-color: #', $color, '">';
 
 				if ($this->show_edit_buttons)
 					echo '
diff --git a/templates/PhotosIndex.php b/templates/PhotosIndex.php
index 0a94fc1d..de1ad3af 100644
--- a/templates/PhotosIndex.php
+++ b/templates/PhotosIndex.php
@@ -139,12 +139,8 @@ class PhotosIndex extends SubTemplate
 
 		foreach ($photos as $image)
 		{
-			$color = $image->bestColor();
-			if ($color == 'FFFFFF')
-				$color = 'ccc';
-
 			echo '
-						<div style="border-color: #', $color, '" class="landscape">';
+						<div style="border-color: #', $this->color($image), '" class="landscape">';
 
 			$this->photo($image, static::TILE_WIDTH, static::TILE_HEIGHT, 'top');