diff --git a/Changelog b/Changelog
index 25b1d30bc..3e20167f0 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.1.5
     - BUGFIX: Fix actions on selected torrents (non-selected torrents could be affected)
+    - BUGFIX: Only one program preferences dialog is allowed at a time
     - BUGFIX: Link against boost and ssl to fix issues with gold linker
     - BUGFIX: Fix memory leak in RSS
 
diff --git a/src/GUI.cpp b/src/GUI.cpp
index da0430f66..2e0808ab5 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -908,8 +908,10 @@ void GUI::createTrayIcon() {
 
 // Display Program Options
 void GUI::on_actionOptions_triggered() {
-  options = new options_imp(this);
-  connect(options, SIGNAL(status_changed()), this, SLOT(optionsSaved()));
+  if(!options) {
+    options = new options_imp(this);
+    connect(options, SIGNAL(status_changed()), this, SLOT(optionsSaved()));
+  }
 }
 
 /*****************************************************