diff --git a/src/covermanager/albumcoverchoicecontroller.h b/src/covermanager/albumcoverchoicecontroller.h
index ffe36a7f0..bfda23438 100644
--- a/src/covermanager/albumcoverchoicecontroller.h
+++ b/src/covermanager/albumcoverchoicecontroller.h
@@ -70,7 +70,7 @@ class AlbumCoverChoiceController : public QWidget {
   void ReloadSettings();
 
   CollectionSettingsPage::SaveCoverType get_save_album_cover_type() const { return (save_embedded_cover_override_ ? CollectionSettingsPage::SaveCoverType_Embedded : save_cover_type_); }
-  void set_save_embedded_cover_override(const bool value) { save_embedded_cover_override_ = value; }
+  CollectionSettingsPage::SaveCoverType get_collection_save_album_cover_type() const { return save_cover_type_; }
 
   // Getters for all QActions implemented by this controller.
 
@@ -149,15 +149,17 @@ class AlbumCoverChoiceController : public QWidget {
 
   static bool CanAcceptDrag(const QDragEnterEvent *e);
 
- signals:
-  void AutomaticCoverSearchDone();
+ public slots:
+  void set_save_embedded_cover_override(const bool value) { save_embedded_cover_override_ = value; }
 
  private slots:
   void AlbumCoverFetched(const quint64 id, const AlbumCoverImageResult &result, const CoverSearchStatistics &statistics);
   void SaveEmbeddedCoverAsyncFinished(quint64 id, const bool success);
 
- private:
+ signals:
+  void AutomaticCoverSearchDone();
 
+ private:
   QString GetInitialPathForFileDialog(const Song &song, const QString &filename);
 
   static bool IsKnownImageExtension(const QString &suffix);
diff --git a/src/dialogs/edittagdialog.cpp b/src/dialogs/edittagdialog.cpp
index fb4e1acb4..c71f57619 100644
--- a/src/dialogs/edittagdialog.cpp
+++ b/src/dialogs/edittagdialog.cpp
@@ -202,6 +202,7 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent)
   QObject::connect(album_cover_choice_controller_->clear_cover_action(), &QAction::triggered, this, &EditTagDialog::ClearCover);
   QObject::connect(album_cover_choice_controller_->delete_cover_action(), &QAction::triggered, this, &EditTagDialog::DeleteCover);
   QObject::connect(album_cover_choice_controller_->show_cover_action(), &QAction::triggered, this, &EditTagDialog::ShowCover);
+  QObject::connect(ui_->checkbox_embedded_cover, &QCheckBox::toggled, album_cover_choice_controller_, &AlbumCoverChoiceController::set_save_embedded_cover_override);
 
   cover_menu_->addActions(actions);
 
@@ -668,7 +669,7 @@ void EditTagDialog::SelectionChanged() {
 
   album_cover_choice_controller_->search_for_cover_action()->setEnabled(app_->cover_providers()->HasAnyProviders());
 
-  const bool embedded_cover = (first_song.save_embedded_cover_supported() && (first_song.has_embedded_cover() || album_cover_choice_controller_->get_save_album_cover_type() == CollectionSettingsPage::SaveCoverType_Embedded));
+  const bool embedded_cover = (first_song.save_embedded_cover_supported() && (first_song.has_embedded_cover() || album_cover_choice_controller_->get_collection_save_album_cover_type() == CollectionSettingsPage::SaveCoverType_Embedded));
   ui_->checkbox_embedded_cover->setChecked(embedded_cover);
   album_cover_choice_controller_->set_save_embedded_cover_override(embedded_cover);