diff --git a/src/backendchoosedialog.cpp b/src/backendchoosedialog.cpp
index e6516d75..aa4c44bc 100644
--- a/src/backendchoosedialog.cpp
+++ b/src/backendchoosedialog.cpp
@@ -1,119 +1,140 @@
 /*
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2009 Alexander Rieder <alexanderrieder@gmail.com>
+    Copyright (C) 2019 Alexander Semke <alexander.semke@web.de>
  */
 
 #include "backendchoosedialog.h"
 #include "lib/backend.h"
 #include "settings.h"
 
 #include <KIconLoader>
 #include <KLocalizedString>
+#include <KSharedConfig>
+#include <KWindowConfig>
 
 #include <QIcon>
 #include <QPushButton>
+#include <QWindow>
 
 BackendChooseDialog::BackendChooseDialog(QWidget* parent) : QDialog(parent)
 {
     QWidget* w = new QWidget(this);
     m_ui.setupUi(w);
 
     QGridLayout* layout = new QGridLayout;
     setLayout(layout);
     layout->addWidget(w);
 
     m_ui.backendList->setIconSize(QSize(KIconLoader::SizeMedium, KIconLoader::SizeMedium));
     m_ui.backendList->setSortingEnabled(true);
     connect(m_ui.backendList, &QListWidget::currentItemChanged, this, &BackendChooseDialog::updateContent);
     connect(m_ui.backendList, &QListWidget::itemDoubleClicked, this, &BackendChooseDialog::accept);
 
     m_ui.buttonBox->button(QDialogButtonBox::Ok);
     m_ui.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QApplication::style()->standardIcon(QStyle::SP_DialogOkButton));
     m_ui.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QApplication::style()->standardIcon(QStyle::SP_DialogCancelButton));
 
     for (auto* backend : Cantor::Backend::availableBackends())
     {
         qDebug() << backend->name() << backend->isEnabled() << backend->requirementsFullfilled();
         if(!backend->isEnabled())
             if (backend->requirementsFullfilled())
                 continue;
 
         QListWidgetItem* item = new QListWidgetItem(m_ui.backendList);
         item->setText(backend->name());
         item->setIcon(QIcon::fromTheme(backend->icon()));
         m_ui.backendList->addItem(item);
         if(m_ui.backendList->currentItem() == nullptr)
             m_ui.backendList->setCurrentItem(item);
 
         if(backend->name()==Settings::self()->defaultBackend())
             m_ui.backendList->setCurrentItem(item);
     }
 
+    int height = m_ui.backendList->iconSize().height() * m_ui.backendList->count();
+    m_ui.backendList->setMinimumSize(0, height);
+
     setWindowTitle(i18n("Select the Backend"));
+    setWindowIcon(QIcon::fromTheme(QLatin1String("run-build")));
 
     connect(m_ui.buttonBox, &QDialogButtonBox::accepted, this, &BackendChooseDialog::accept);
     connect(m_ui.buttonBox, &QDialogButtonBox::rejected, this, &BackendChooseDialog::close);
-
     connect(this, &BackendChooseDialog::accepted, this, &BackendChooseDialog::onAccept);
+
+	//restore saved settings if available
+	create(); // ensure there's a window created
+	KConfigGroup conf(KSharedConfig::openConfig(), "BackendChooseDialog");
+	if (conf.exists()) {
+		KWindowConfig::restoreWindowSize(windowHandle(), conf);
+		resize(windowHandle()->size()); // workaround for QTBUG-40584
+	} else
+		resize(QSize(500, 200).expandedTo(minimumSize()));
+}
+
+BackendChooseDialog::~BackendChooseDialog() {
+	KConfigGroup conf(KSharedConfig::openConfig(), "BackendChooseDialog");
+	KWindowConfig::saveWindowSize(windowHandle(), conf);
 }
 
 void BackendChooseDialog::onAccept()
 {
     m_backend = m_ui.backendList->currentItem()->text();
     if(m_ui.makeDefault->isChecked())
     {
         Settings::self()->setDefaultBackend(m_backend);
         Settings::self()->save();
     }
 }
 
 void BackendChooseDialog::updateContent()
 {
     auto* current = Cantor::Backend::getBackend( m_ui.backendList->currentItem()->text() );
     if (current)
     {
         QString desc;
         QString reason;
         QString header = i18n("<h1>%1</h1>"
                               "<div><b>Recommended version:</b> %2</div>",
                               current->name(), current->version());
         QString info = i18n("<hr><div>%1</div><br>"
                             "<div>See <a href=\"%2\">%2</a> for more information.</div>",
                             current->description(), current->url());
 
         if (current->requirementsFullfilled(&reason))
         {
             desc = header + info;
             m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
             m_ui.makeDefault->setEnabled(true);
         }
         else
         {
             QString reasonMsg = i18n("<br><div><b>Some requirements are not fulfilled: </b>%1</div>", reason);
             desc = header + reasonMsg + info;
             m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
             m_ui.makeDefault->setEnabled(false);
         }
         m_ui.descriptionView->setHtml(desc);
     }
 }
 
 QString BackendChooseDialog::backendName()
 {
     return m_backend;
 }
diff --git a/src/backendchoosedialog.h b/src/backendchoosedialog.h
index 8347cb13..8a29026f 100644
--- a/src/backendchoosedialog.h
+++ b/src/backendchoosedialog.h
@@ -1,46 +1,46 @@
 /*
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License
     as published by the Free Software Foundation; either version 2
     of the License, or (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA  02110-1301, USA.
 
     ---
     Copyright (C) 2009 Alexander Rieder <alexanderrieder@gmail.com>
  */
 
 #ifndef _BACKENDCHOOSEDIALOG_H
 #define _BACKENDCHOOSEDIALOG_H
 
 #include <QDialog>
 
 #include <ui_backendchooser.h>
 
 class BackendChooseDialog : public QDialog
 {
   Q_OBJECT
   public:
     explicit BackendChooseDialog(QWidget* parent);
-    ~BackendChooseDialog() override = default;
+    ~BackendChooseDialog() override;
 
     QString backendName();
 
   protected Q_SLOTS:
     void onAccept();
     void updateContent();
 
   private:
     Ui::BackendChooserBase m_ui;
     QString m_backend;
 };
 
 #endif /* _BACKENDCHOOSEDIALOG_H */