diff --git a/launcher/BaseInstance.cpp b/launcher/BaseInstance.cpp
index 114275b3c..eab91a5eb 100644
--- a/launcher/BaseInstance.cpp
+++ b/launcher/BaseInstance.cpp
@@ -389,11 +389,7 @@ void BaseInstance::setName(QString val)
 bool BaseInstance::syncInstanceDirName(const QString& newRoot) const
 {
     auto oldRoot = instanceRoot();
-    if (oldRoot == newRoot)
-        return true;
-    if (!QFile::rename(oldRoot, newRoot))
-        return false;
-    return true;
+    return oldRoot == newRoot || QFile::rename(oldRoot, newRoot);
 }
 
 QString BaseInstance::name() const
diff --git a/launcher/InstanceDirUpdate.cpp b/launcher/InstanceDirUpdate.cpp
index 65a62129b..8be0dccac 100644
--- a/launcher/InstanceDirUpdate.cpp
+++ b/launcher/InstanceDirUpdate.cpp
@@ -35,7 +35,6 @@
 #include "InstanceDirUpdate.h"
 
 #include <QCheckBox>
-#include <QMessageBox>
 
 #include "Application.h"
 #include "FileSystem.h"
@@ -69,17 +68,16 @@ QString askToUpdateInstanceDirName(InstancePtr instance, const QString& oldName,
 
     // Ask if we should rename
     if (renamingMode == "AskEverytime") {
-        QMessageBox messageBox(parent);
-        messageBox.setText(QObject::tr("Would you also like to rename the instance folder?"));
-        messageBox.setInformativeText(QObject::tr("Renaming \'%1\' -> \'%2\'").arg(oldName, newName));
-        messageBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-        messageBox.setDefaultButton(QMessageBox::Yes);
-        messageBox.setIcon(QMessageBox::Question);
-
         auto checkBox = new QCheckBox(QObject::tr("&Remember my choice"), parent);
-        messageBox.setCheckBox(checkBox);
+        auto dialog =
+            CustomMessageBox::selectable(parent, QObject::tr("Rename instance folder"),
+                                         QObject::tr("Would you also like to rename the instance folder?\n\n"
+                                                     "Old name: %1\n"
+                                                     "New name: %2")
+                                             .arg(oldName, newName),
+                                         QMessageBox::Question, QMessageBox::No | QMessageBox::Yes, QMessageBox::NoButton, checkBox);
 
-        auto res = messageBox.exec();
+        auto res = dialog->exec();
         if (checkBox->isChecked()) {
             if (res == QMessageBox::Yes)
                 APPLICATION->settings()->set("InstRenamingMode", "PhysicalDir");
diff --git a/launcher/ui/dialogs/CustomMessageBox.cpp b/launcher/ui/dialogs/CustomMessageBox.cpp
index 1af47a449..ca0fe99e0 100644
--- a/launcher/ui/dialogs/CustomMessageBox.cpp
+++ b/launcher/ui/dialogs/CustomMessageBox.cpp
@@ -21,7 +21,8 @@ QMessageBox* selectable(QWidget* parent,
                         const QString& text,
                         QMessageBox::Icon icon,
                         QMessageBox::StandardButtons buttons,
-                        QMessageBox::StandardButton defaultButton)
+                        QMessageBox::StandardButton defaultButton,
+                        QCheckBox* checkBox)
 {
     QMessageBox* messageBox = new QMessageBox(parent);
     messageBox->setWindowTitle(title);
@@ -31,6 +32,8 @@ QMessageBox* selectable(QWidget* parent,
     messageBox->setTextInteractionFlags(Qt::TextSelectableByMouse);
     messageBox->setIcon(icon);
     messageBox->setTextInteractionFlags(Qt::TextBrowserInteraction);
+    if (checkBox)
+        messageBox->setCheckBox(checkBox);
 
     return messageBox;
 }
diff --git a/launcher/ui/dialogs/CustomMessageBox.h b/launcher/ui/dialogs/CustomMessageBox.h
index a9bc6a24a..1ee29903e 100644
--- a/launcher/ui/dialogs/CustomMessageBox.h
+++ b/launcher/ui/dialogs/CustomMessageBox.h
@@ -23,5 +23,6 @@ QMessageBox* selectable(QWidget* parent,
                         const QString& text,
                         QMessageBox::Icon icon = QMessageBox::NoIcon,
                         QMessageBox::StandardButtons buttons = QMessageBox::Ok,
-                        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+                        QMessageBox::StandardButton defaultButton = QMessageBox::NoButton,
+                        QCheckBox* checkBox = nullptr);
 }