diff --git a/src/ripper/ripcddialog.cpp b/src/ripper/ripcddialog.cpp
index 6387bb919..56025b5d4 100644
--- a/src/ripper/ripcddialog.cpp
+++ b/src/ripper/ripcddialog.cpp
@@ -186,7 +186,7 @@ void RipCDDialog::Options() {
   TranscoderPreset preset = ui_->format->itemData(ui_->format->currentIndex())
                                 .value<TranscoderPreset>();
 
-  TranscoderOptionsDialog dialog(preset.type_, this);
+  TranscoderOptionsDialog dialog(preset, this);
   if (dialog.is_valid()) {
     dialog.exec();
   }
diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp
index fdc8f4701..668d18c47 100644
--- a/src/transcoder/transcodedialog.cpp
+++ b/src/transcoder/transcodedialog.cpp
@@ -313,7 +313,7 @@ void TranscodeDialog::Options() {
   TranscoderPreset preset = ui_->format->itemData(ui_->format->currentIndex())
                                 .value<TranscoderPreset>();
 
-  TranscoderOptionsDialog dialog(preset.type_, this);
+  TranscoderOptionsDialog dialog(preset, this);
   if (dialog.is_valid()) {
     dialog.exec();
   }
diff --git a/src/transcoder/transcoderoptionsdialog.cpp b/src/transcoder/transcoderoptionsdialog.cpp
index 0ad9a3462..177a34988 100644
--- a/src/transcoder/transcoderoptionsdialog.cpp
+++ b/src/transcoder/transcoderoptionsdialog.cpp
@@ -17,6 +17,7 @@
 
 #include "transcoderoptionsdialog.h"
 
+#include "transcoder.h"
 #include "transcoderoptionsaac.h"
 #include "transcoderoptionsflac.h"
 #include "transcoderoptionsmp3.h"
@@ -26,12 +27,12 @@
 #include "transcoderoptionswma.h"
 #include "ui_transcoderoptionsdialog.h"
 
-TranscoderOptionsDialog::TranscoderOptionsDialog(Song::FileType type,
+TranscoderOptionsDialog::TranscoderOptionsDialog(const TranscoderPreset& preset,
                                                  QWidget* parent)
     : QDialog(parent), ui_(new Ui_TranscoderOptionsDialog), options_(nullptr) {
   ui_->setupUi(this);
 
-  switch (type) {
+  switch (preset.type_) {
     case Song::Type_Flac:
     case Song::Type_OggFlac:
       options_ = new TranscoderOptionsFlac(this);
@@ -59,7 +60,7 @@ TranscoderOptionsDialog::TranscoderOptionsDialog(Song::FileType type,
   }
 
   if (options_) {
-    setWindowTitle(windowTitle() + " - " + Song::TextForFiletype(type));
+    setWindowTitle(windowTitle() + " - " + Song::TextForFiletype(preset.type_));
     options_->layout()->setContentsMargins(0, 0, 0, 0);
     ui_->verticalLayout->insertWidget(0, options_);
     resize(width(), minimumHeight());
diff --git a/src/transcoder/transcoderoptionsdialog.h b/src/transcoder/transcoderoptionsdialog.h
index 8a3408e51..0eee25b63 100644
--- a/src/transcoder/transcoderoptionsdialog.h
+++ b/src/transcoder/transcoderoptionsdialog.h
@@ -20,16 +20,17 @@
 
 #include <QDialog>
 
-#include "core/song.h"
 #include "transcoderoptionsinterface.h"
 
 class Ui_TranscoderOptionsDialog;
+struct TranscoderPreset;
 
 class TranscoderOptionsDialog : public QDialog {
   Q_OBJECT
 
  public:
-  TranscoderOptionsDialog(Song::FileType type, QWidget* parent = nullptr);
+  TranscoderOptionsDialog(const TranscoderPreset& preset,
+                          QWidget* parent = nullptr);
   ~TranscoderOptionsDialog();
 
   bool is_valid() const { return options_; }
diff --git a/src/ui/networkremotesettingspage.cpp b/src/ui/networkremotesettingspage.cpp
index d3b21d536..1b26eae25 100644
--- a/src/ui/networkremotesettingspage.cpp
+++ b/src/ui/networkremotesettingspage.cpp
@@ -204,7 +204,7 @@ void NetworkRemoteSettingsPage::Options() {
   TranscoderPreset preset = ui_->format->itemData(ui_->format->currentIndex())
                                 .value<TranscoderPreset>();
 
-  TranscoderOptionsDialog dialog(preset.type_, this);
+  TranscoderOptionsDialog dialog(preset, this);
   dialog.set_settings_postfix(NetworkRemote::kTranscoderSettingPostfix);
   if (dialog.is_valid()) {
     dialog.exec();