diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp
index f687f8d3d7..7806e162ab 100644
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@ -585,8 +585,13 @@ void AccountSettings::slotUpdateQuota(qint64 total, qint64 used)
 
 void AccountSettings::slotIgnoreFilesEditor()
 {
-    IgnoreListEditor *ignoreEditor = new IgnoreListEditor;
-    ignoreEditor->open();
+    if (_ignoreEditor.isNull()) {
+        _ignoreEditor = new IgnoreListEditor(this);
+        _ignoreEditor->setAttribute( Qt::WA_DeleteOnClose, true );
+        _ignoreEditor->open();
+    } else {
+        Utility::raiseDialog(_ignoreEditor);
+    }
 }
 
 void AccountSettings::slotInfoAboutCurrentFolder()
diff --git a/src/mirall/accountsettings.h b/src/mirall/accountsettings.h
index 0d5c5f1a8b..647e2ec6aa 100644
--- a/src/mirall/accountsettings.h
+++ b/src/mirall/accountsettings.h
@@ -38,6 +38,7 @@ class AccountSettings;
 
 class FolderMan;
 class FileItemDialog;
+class IgnoreListEditor;
 
 class AccountSettings : public QWidget
 {
@@ -88,6 +89,7 @@ private:
 
     Ui::AccountSettings *ui;
     QPointer<FileItemDialog> _fileItemDialog;
+    QPointer<IgnoreListEditor> _ignoreEditor;
     FolderMan *_folderMan;
     QStandardItemModel *_model;
     QListWidgetItem *_item;
diff --git a/src/mirall/ignorelisteditor.cpp b/src/mirall/ignorelisteditor.cpp
index 6eeb7b0bf3..e1e831d048 100644
--- a/src/mirall/ignorelisteditor.cpp
+++ b/src/mirall/ignorelisteditor.cpp
@@ -26,7 +26,7 @@
 
 namespace Mirall {
 
-IgnoreListEditor::IgnoreListEditor(QDialog *parent) :
+IgnoreListEditor::IgnoreListEditor(QWidget *parent) :
     QDialog(parent),
     ui(new Ui::IgnoreListEditor)
 {
diff --git a/src/mirall/ignorelisteditor.h b/src/mirall/ignorelisteditor.h
index 74722bb706..208e1e7dff 100644
--- a/src/mirall/ignorelisteditor.h
+++ b/src/mirall/ignorelisteditor.h
@@ -29,7 +29,7 @@ class IgnoreListEditor : public QDialog
     Q_OBJECT
 
 public:
-    explicit IgnoreListEditor(QDialog *parent = 0);
+    explicit IgnoreListEditor(QWidget *parent = 0);
     ~IgnoreListEditor();
 
 private slots:
diff --git a/src/mirall/ignorelisteditor.ui b/src/mirall/ignorelisteditor.ui
index 7bc157db4c..7d5f98356f 100644
--- a/src/mirall/ignorelisteditor.ui
+++ b/src/mirall/ignorelisteditor.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Ignored Files Editor</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">