diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp
index 303d22b7f39..2622ff47dd2 100644
--- a/src/base/utils/misc.cpp
+++ b/src/base/utils/misc.cpp
@@ -259,12 +259,14 @@ QString Utils::Misc::unitString(const SizeUnit unit, const bool isSpeed)
     return ret;
 }
 
-QString Utils::Misc::friendlyUnit(const qint64 bytes, const bool isSpeed)
+QString Utils::Misc::friendlyUnit(const qint64 bytes, const bool isSpeed, const int precision)
 {
     const std::optional<SplitToFriendlyUnitResult> result = splitToFriendlyUnit(bytes);
     if (!result)
         return QCoreApplication::translate("misc", "Unknown", "Unknown (size)");
-    return Utils::String::fromDouble(result->value, friendlyUnitPrecision(result->unit))
+
+    const int digitPrecision = (precision >= 0) ? precision : friendlyUnitPrecision(result->unit);
+    return Utils::String::fromDouble(result->value, digitPrecision)
            + C_NON_BREAKING_SPACE
            + unitString(result->unit, isSpeed);
 }
diff --git a/src/base/utils/misc.h b/src/base/utils/misc.h
index a56e488bf69..d58ae50f386 100644
--- a/src/base/utils/misc.h
+++ b/src/base/utils/misc.h
@@ -74,7 +74,7 @@ namespace Utils::Misc
 
     // return the best user friendly storage unit (B, KiB, MiB, GiB, TiB)
     // value must be given in bytes
-    QString friendlyUnit(qint64 bytes, bool isSpeed = false);
+    QString friendlyUnit(qint64 bytes, bool isSpeed = false, int precision = -1);
     int friendlyUnitPrecision(SizeUnit unit);
     qint64 sizeInBytes(qreal size, SizeUnit unit);
 
diff --git a/src/gui/torrentcreatordialog.cpp b/src/gui/torrentcreatordialog.cpp
index 749bf21d45e..27dda0be0d9 100644
--- a/src/gui/torrentcreatordialog.cpp
+++ b/src/gui/torrentcreatordialog.cpp
@@ -39,6 +39,7 @@
 #include "base/bittorrent/torrentdescriptor.h"
 #include "base/global.h"
 #include "base/utils/fs.h"
+#include "base/utils/misc.h"
 #include "ui_torrentcreatordialog.h"
 #include "utils.h"
 
@@ -80,6 +81,18 @@ TorrentCreatorDialog::TorrentCreatorDialog(QWidget *parent, const Path &defaultP
 {
     m_ui->setupUi(this);
 
+    m_ui->comboPieceSize->addItem(tr("Auto"), 0);
+#ifdef QBT_USES_LIBTORRENT2
+    for (int i = 4; i <= 18; ++i)
+#else
+    for (int i = 4; i <= 17; ++i)
+#endif
+    {
+        const int size = 1024 << i;
+        const QString displaySize = Utils::Misc::friendlyUnit(size, false, 0);
+        m_ui->comboPieceSize->addItem(displaySize, size);
+    }
+
     m_ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create Torrent"));
     m_ui->textInputPath->setMode(FileSystemPathEdit::Mode::ReadOnly);
 
@@ -133,8 +146,7 @@ void TorrentCreatorDialog::onAddFileButtonClicked()
 
 int TorrentCreatorDialog::getPieceSize() const
 {
-    const int pieceSizes[] = {0, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768};  // base unit in KiB
-    return pieceSizes[m_ui->comboPieceSize->currentIndex()] * 1024;
+    return m_ui->comboPieceSize->currentData().toInt();
 }
 
 #ifdef QBT_USES_LIBTORRENT2
@@ -251,15 +263,19 @@ void TorrentCreatorDialog::handleCreationFailure(const QString &msg)
 
 void TorrentCreatorDialog::handleCreationSuccess(const Path &path, const Path &branchPath)
 {
-    // Remove busy cursor
     setCursor(QCursor(Qt::ArrowCursor));
+    setInteractionEnabled(true);
+
+    QMessageBox::information(this, tr("Torrent creator")
+        , u"%1\n%2"_s.arg(tr("Torrent created:"), path.toString()));
+
     if (m_ui->checkStartSeeding->isChecked())
     {
-        // Create save path temp data
         const auto loadResult = BitTorrent::TorrentDescriptor::loadFromFile(path);
         if (!loadResult)
         {
-            QMessageBox::critical(this, tr("Torrent creation failed"), tr("Reason: Created torrent is invalid. It won't be added to download list."));
+            const QString message = tr("Add torrent to transfer list failed.") + u'\n' + tr("Reason: \"%1\"").arg(loadResult.error());
+            QMessageBox::critical(this, tr("Add torrent failed"), message);
             return;
         }
 
@@ -276,9 +292,6 @@ void TorrentCreatorDialog::handleCreationSuccess(const Path &path, const Path &b
 
         BitTorrent::Session::instance()->addTorrent(loadResult.value(), params);
     }
-    QMessageBox::information(this, tr("Torrent creator")
-        , u"%1\n%2"_s.arg(tr("Torrent created:"), path.toString()));
-    setInteractionEnabled(true);
 }
 
 void TorrentCreatorDialog::updateProgressBar(int progress)
@@ -308,6 +321,7 @@ void TorrentCreatorDialog::setInteractionEnabled(const bool enabled) const
     m_ui->trackersList->setEnabled(enabled);
     m_ui->URLSeedsList->setEnabled(enabled);
     m_ui->txtComment->setEnabled(enabled);
+    m_ui->lineEditSource->setEnabled(enabled);
     m_ui->comboPieceSize->setEnabled(enabled);
     m_ui->buttonCalcTotalPieces->setEnabled(enabled);
     m_ui->checkPrivate->setEnabled(enabled);
diff --git a/src/gui/torrentcreatordialog.ui b/src/gui/torrentcreatordialog.ui
index 6b446d1ee33..d25d58a51c1 100644
--- a/src/gui/torrentcreatordialog.ui
+++ b/src/gui/torrentcreatordialog.ui
@@ -194,71 +194,6 @@
               <property name="minimumContentsLength">
                <number>7</number>
               </property>
-              <item>
-               <property name="text">
-                <string>Auto</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>16 KiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>32 KiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>64 KiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>128 KiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>256 KiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>512 KiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>1 MiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>2 MiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>4 MiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>8 MiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>16 MiB</string>
-               </property>
-              </item>
-              <item>
-               <property name="text">
-                <string>32 MiB</string>
-               </property>
-              </item>
              </widget>
             </item>
             <item>