diff --git a/core/js/quick.js b/core/js/quick.js
index 984d3ae5..750bdd40 100644
--- a/core/js/quick.js
+++ b/core/js/quick.js
@@ -50,6 +50,9 @@ var show_quick = function() {
 };
 
 var quick_do = function(cont, pane, img) {
+  if (pane.hasClass("ui-state-disabled")) {
+    return false;
+  }
   if (pane.hasClass("gDialogLink")) {
     openDialog(pane, function() { window.location.reload(); });
   } else {
diff --git a/core/views/quick_pane.html.php b/core/views/quick_pane.html.php
index 7d4b6959..0f94a413 100644
--- a/core/views/quick_pane.html.php
+++ b/core/views/quick_pane.html.php
@@ -46,15 +46,19 @@
 </a>
 <? endif ?>
 
+<? $disabledState = "" ?>
 <? if (access::can("edit", $item->parent())): ?>
 <? if ($item->type == "photo"): ?>
 <? $title = t("Choose this photo as the album cover") ?>
 <? elseif ($item->type == "movie"): ?>
 <? $title = t("Choose this movie as the album cover") ?>
 <? elseif ($item->type == "album"): ?>
+<? if (empty($item->album_cover_item_id)): ?>
+<? $disabledState = empty($item->album_cover_item_id) ? " ui-state-disabled" : "" ?>
+<? endif ?>
 <? $title = t("Choose this album as the album cover") ?>
 <? endif ?>
-<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type") ?>"
+<a class="gButtonLink ui-corner-all ui-state-default<?= $disabledState ?>" href="<?= url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type") ?>"
    title="<?= $title ?>">
   <span class="ui-icon ui-icon-star">
     <?= $title ?>