diff --git a/src/librssguard/gui/settings/settingsbrowsermail.cpp b/src/librssguard/gui/settings/settingsbrowsermail.cpp
index 0d2175cca..5572bbb64 100644
--- a/src/librssguard/gui/settings/settingsbrowsermail.cpp
+++ b/src/librssguard/gui/settings/settingsbrowsermail.cpp
@@ -57,7 +57,7 @@ SettingsBrowserMail::SettingsBrowserMail(Settings* settings, QWidget* parent)
   connect(m_ui->m_btnAddTool, &QPushButton::clicked, this, &SettingsBrowserMail::addExternalTool);
   connect(m_ui->m_btnEditTool, &QPushButton::clicked, this, &SettingsBrowserMail::editSelectedExternalTool);
   connect(m_ui->m_btnDeleteTool, &QPushButton::clicked, this, &SettingsBrowserMail::deleteSelectedExternalTool);
-  connect(m_ui->m_listTools, &QTreeWidget::itemDoubleClicked, this, &SettingsBrowserMail::editSelectedExternalTool);
+  connect(m_ui->m_listTools, &QTreeWidget::itemDoubleClicked, m_ui->m_btnEditTool, &QPushButton::click);
   connect(m_ui->m_listTools, &QTreeWidget::currentItemChanged, this, [this](QTreeWidgetItem* current, QTreeWidgetItem* previous) {
     Q_UNUSED(previous)
 
diff --git a/src/librssguard/miscellaneous/externaltool.cpp b/src/librssguard/miscellaneous/externaltool.cpp
index 339c18855..92ce2b644 100644
--- a/src/librssguard/miscellaneous/externaltool.cpp
+++ b/src/librssguard/miscellaneous/externaltool.cpp
@@ -70,5 +70,10 @@ void ExternalTool::setToolsToSettings(QVector<ExternalTool>& tools) {
 }
 
 bool ExternalTool::run(const QString& target) {
-  return IOFactory::startProcessDetached(executable(), QStringList() << parameters() << target);
+  if (parameters().isEmpty()) {
+    return IOFactory::startProcessDetached(executable(), { target });
+  }
+  else {
+    return IOFactory::startProcessDetached(executable(), QStringList() << parameters() << target);
+  }
 }