diff --git a/launcher/ui/pages/modplatform/OptionalModDialog.cpp b/launcher/ui/pages/modplatform/OptionalModDialog.cpp
index 620de4f74..fc1c8b3cb 100644
--- a/launcher/ui/pages/modplatform/OptionalModDialog.cpp
+++ b/launcher/ui/pages/modplatform/OptionalModDialog.cpp
@@ -19,125 +19,45 @@
 #include "OptionalModDialog.h"
 #include "ui_OptionalModDialog.h"
 
-OptionalModListModel::OptionalModListModel(QWidget* parent, QStringList mods) : QAbstractListModel(parent), m_mods(mods) {}
-
-QStringList OptionalModListModel::getResult()
-{
-    QStringList result;
-    for (const auto& mod : m_mods) {
-        if (m_selected.value(mod, false)) {
-            result << mod;
-        }
-    }
-    return result;
-}
-
-int OptionalModListModel::rowCount(const QModelIndex& parent) const
-{
-    return parent.isValid() ? 0 : m_mods.size();
-}
-
-int OptionalModListModel::columnCount(const QModelIndex& parent) const
-{
-    // Enabled, Name
-    return parent.isValid() ? 0 : 2;
-}
-
-QVariant OptionalModListModel::data(const QModelIndex& index, int role) const
-{
-    auto row = index.row();
-    auto mod = m_mods.at(row);
-
-    if (role == Qt::DisplayRole && index.column() == NameColumn) {
-        return mod;
-    } else if (role == Qt::CheckStateRole && index.column() == EnabledColumn) {
-        return m_selected.value(mod, false) ? Qt::Checked : Qt::Unchecked;
-    }
-
-    return {};
-}
-
-bool OptionalModListModel::setData(const QModelIndex& index, [[maybe_unused]] const QVariant& value, int role)
-{
-    if (role == Qt::CheckStateRole) {
-        auto row = index.row();
-        auto mod = m_mods.at(row);
-
-        toggleMod(mod, row);
-        return true;
-    }
-
-    return false;
-}
-
-QVariant OptionalModListModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (role == Qt::DisplayRole && orientation == Qt::Horizontal) {
-        switch (section) {
-            case EnabledColumn:
-                return QString();
-            case NameColumn:
-                return QString("Name");
-        }
-    }
-
-    return {};
-}
-
-Qt::ItemFlags OptionalModListModel::flags(const QModelIndex& index) const
-{
-    auto flags = QAbstractListModel::flags(index);
-    if (index.isValid() && index.column() == EnabledColumn) {
-        flags |= Qt::ItemIsUserCheckable;
-    }
-    return flags;
-}
-
-void OptionalModListModel::toggleAll(bool enabled)
-{
-    for (const auto& mod : m_mods) {
-        m_selected[mod] = enabled;
-    }
-
-    emit dataChanged(OptionalModListModel::index(0, EnabledColumn), OptionalModListModel::index(m_mods.size() - 1, EnabledColumn));
-}
-
-void OptionalModListModel::toggleMod(QString mod, int index)
-{
-    auto enable = !m_selected.value(mod, false);
-
-    setMod(mod, index, enable);
-}
-
-void OptionalModListModel::setMod(QString mod, int index, bool enable, bool shouldEmit)
-{
-    if (m_selected.value(mod, false) == enable)
-        return;
-
-    m_selected[mod] = enable;
-
-    if (shouldEmit) {
-        emit dataChanged(OptionalModListModel::index(index, EnabledColumn), OptionalModListModel::index(index, EnabledColumn));
-    }
-}
-
-OptionalModDialog::OptionalModDialog(QWidget* parent, QStringList mods) : QDialog(parent), ui(new Ui::OptionalModDialog)
+OptionalModDialog::OptionalModDialog(QWidget* parent, const QStringList& mods) : QDialog(parent), ui(new Ui::OptionalModDialog)
 {
     ui->setupUi(this);
+    for (const QString& mod : mods) {
+        auto item = new QListWidgetItem(mod, ui->list);
+        item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+        item->setCheckState(Qt::Unchecked);
+        item->setData(Qt::UserRole, mod);
+    }
 
-    listModel = new OptionalModListModel(this, mods);
-    ui->treeView->setModel(listModel);
-
-    ui->treeView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-    ui->treeView->header()->setSectionResizeMode(OptionalModListModel::NameColumn, QHeaderView::Stretch);
-
-    connect(ui->selectAllButton, &QPushButton::clicked, listModel, &OptionalModListModel::selectAll);
-    connect(ui->clearAllButton, &QPushButton::clicked, listModel, &OptionalModListModel::clearAll);
-    connect(ui->installButton, &QPushButton::clicked, this, &QDialog::accept);
-    connect(ui->cancelButton, &QPushButton::clicked, this, &QDialog::reject);
+    connect(ui->selectAllButton, &QPushButton::clicked, ui->list, [this] {
+        for (int i = 0; i < ui->list->count(); i++)
+            ui->list->item(i)->setCheckState(Qt::Checked);
+    });
+    connect(ui->clearAllButton, &QPushButton::clicked, ui->list, [this] {
+        for (int i = 0; i < ui->list->count(); i++)
+            ui->list->item(i)->setCheckState(Qt::Unchecked);
+    });
+    connect(ui->list, &QListWidget::itemActivated, [](QListWidgetItem* item) {
+        if (item->checkState() == Qt::Checked)
+            item->setCheckState(Qt::Unchecked);
+        else
+            item->setCheckState(Qt::Checked);
+    });
 }
 
 OptionalModDialog::~OptionalModDialog()
 {
     delete ui;
 }
+
+QStringList OptionalModDialog::getResult()
+{
+    QStringList result;
+    result.reserve(ui->list->count());
+    for (int i = 0; i < ui->list->count(); i++) {
+        auto item = ui->list->item(i);
+        if (item->checkState() == Qt::Checked)
+            result.append(item->data(Qt::UserRole).toString());
+    }
+    return result;
+}
diff --git a/launcher/ui/pages/modplatform/OptionalModDialog.h b/launcher/ui/pages/modplatform/OptionalModDialog.h
index 4e22d0e46..1897c1fca 100644
--- a/launcher/ui/pages/modplatform/OptionalModDialog.h
+++ b/launcher/ui/pages/modplatform/OptionalModDialog.h
@@ -25,52 +25,15 @@ namespace Ui {
 class OptionalModDialog;
 }
 
-class OptionalModListModel : public QAbstractListModel {
-    Q_OBJECT
-   public:
-    enum Columns {
-        EnabledColumn = 0,
-        NameColumn,
-    };
-
-    OptionalModListModel(QWidget* parent, QStringList mods);
-
-    QStringList getResult();
-
-    int rowCount(const QModelIndex& parent) const override;
-    int columnCount(const QModelIndex& parent) const override;
-
-    QVariant data(const QModelIndex& index, int role) const override;
-    bool setData(const QModelIndex& index, const QVariant& value, int role) override;
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
-
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
-
-   public slots:
-    void selectAll() { toggleAll(true); }
-    void clearAll() { toggleAll(false); };
-    void toggleAll(bool enabled);
-
-   private:
-    void toggleMod(QString mod, int index);
-    void setMod(QString mod, int index, bool enable, bool shouldEmit = true);
-
-   private:
-    QStringList m_mods;
-    QHash<QString, bool> m_selected;
-};
-
 class OptionalModDialog : public QDialog {
     Q_OBJECT
 
    public:
-    OptionalModDialog(QWidget* parent, QStringList mods);
+    OptionalModDialog(QWidget* parent, const QStringList& mods);
     ~OptionalModDialog() override;
 
-    QStringList getResult() { return listModel->getResult(); }
+    QStringList getResult();
 
    private:
     Ui::OptionalModDialog* ui;
-
-    OptionalModListModel* listModel;
 };
diff --git a/launcher/ui/pages/modplatform/OptionalModDialog.ui b/launcher/ui/pages/modplatform/OptionalModDialog.ui
index 76d1da89d..0b809d2cb 100644
--- a/launcher/ui/pages/modplatform/OptionalModDialog.ui
+++ b/launcher/ui/pages/modplatform/OptionalModDialog.ui
@@ -11,81 +11,63 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Select Mods To Install</string>
+   <string>Select Optional Mods</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
    <item row="1" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QLabel" name="label">
-       <property name="font">
-        <font>
-         <pointsize>11</pointsize>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
+      <widget class="QListWidget" name="list">
+       <property name="defaultDropAction">
+        <enum>Qt::IgnoreAction</enum>
        </property>
-       <property name="text">
-        <string>Select optional mods to install.</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="font">
-        <font>
-         <italic>true</italic>
-        </font>
-       </property>
-       <property name="text">
-        <string>Note: All files will be downloaded but the unselected mods will be disabled.</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="ModListView" name="treeView"/>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="cancelButton">
-       <property name="enabled">
+       <property name="alternatingRowColors">
         <bool>true</bool>
        </property>
-       <property name="text">
-        <string>Cancel</string>
-       </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="clearAllButton">
-       <property name="text">
-        <string>Clear All</string>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QPushButton" name="selectAllButton">
+         <property name="text">
+          <string>Select All</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="clearAllButton">
+         <property name="text">
+          <string>Deselect All</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Unchecked mods will be disabled.</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="QPushButton" name="selectAllButton">
-       <property name="text">
-        <string>Select All</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="installButton">
-       <property name="text">
-        <string>Install</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
@@ -93,13 +75,39 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>ModListView</class>
-   <extends>QTreeView</extends>
-   <header>ui/widgets/ModListView.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>OptionalModDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>274</x>
+     <y>284</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>274</x>
+     <y>154</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>OptionalModDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>274</x>
+     <y>284</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>274</x>
+     <y>154</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>