diff --git a/plasma-windowed/CMakeLists.txt b/plasma-windowed/CMakeLists.txt
index c668f5893..867cdc7e9 100644
--- a/plasma-windowed/CMakeLists.txt
+++ b/plasma-windowed/CMakeLists.txt
@@ -1,24 +1,25 @@
 set(plasmawindowed-app_SRCS
     plasmawindowedcorona.cpp
     plasmawindowedview.cpp
     main.cpp
 )
 
 add_executable(plasmawindowed ${plasmawindowed-app_SRCS})
 
 target_link_libraries(
     plasmawindowed
     Qt5::Widgets
     Qt5::Quick
     Qt5::Qml
     KF5::I18n
+    KF5::IconThemes
     KF5::XmlGui
     KF5::PlasmaQuick
     KF5::Plasma
     KF5::DBusAddons
     KF5::Notifications
 )
 
 install(TARGETS plasmawindowed ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 #even if hidden, the desktop file is needed anyways for kdbusservice::unique
 install(FILES plasma-windowed.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/plasma-windowed/plasmawindowedview.cpp b/plasma-windowed/plasmawindowedview.cpp
index 213e10070..6efe609c8 100644
--- a/plasma-windowed/plasmawindowedview.cpp
+++ b/plasma-windowed/plasmawindowedview.cpp
@@ -1,234 +1,248 @@
 /*
  * Copyright 2014  Bhushan Shah <bhush94@gmail.com>
  * Copyright 2014 Marco Martin <notmart@gmail.com>
  *
  * 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) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * 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, see <http://www.gnu.org/licenses/>
  */
 
 #include "plasmawindowedview.h"
 
 #include <QQuickItem>
 #include <QResizeEvent>
 #include <QQmlExpression>
 #include <QMenu>
 #include <QQmlEngine>
 #include <QQmlContext>
+#include <QQmlProperty>
 
 #include <KActionCollection>
 #include <KStatusNotifierItem>
+#include <KIconLoader>
 
 #include <Plasma/Package>
 
 
 PlasmaWindowedView::PlasmaWindowedView(QWindow *parent)
     : QQuickView(parent),
       m_applet(0),
       m_statusNotifier(0),
       m_withStatusNotifier(false)
 {
     engine()->rootContext()->setContextProperty(QStringLiteral("root"), contentItem());
-    QQmlExpression *expr = new QQmlExpression(engine()->rootContext(), contentItem(), QStringLiteral("Qt.createQmlObject('import QtQuick 2.0; import org.kde.plasma.core 2.0; Rectangle {color: theme.backgroundColor; anchors.fill:parent}', root, \"\");"));
-    expr->evaluate();
+    //access appletInterface.Layout.minimumWidth, to create the Layout attached object for appletInterface as a sideeffect
+    QQmlExpression *expr = new QQmlExpression(engine()->rootContext(), contentItem(), QStringLiteral("Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Layouts 1.1; import org.kde.plasma.core 2.0; Rectangle {color: theme.backgroundColor; anchors.fill:parent; property Item appletInterface; onAppletInterfaceChanged: print(appletInterface.Layout.minimumWidth)}', root, \"\");"));
+    m_rootObject = expr->evaluate().value<QQuickItem*>();
 }
 
 PlasmaWindowedView::~PlasmaWindowedView()
 {
 }
 
 void PlasmaWindowedView::setHasStatusNotifier(bool stay)
 {
     Q_ASSERT(!m_statusNotifier);
     m_withStatusNotifier = stay;
 }
 
 void PlasmaWindowedView::setApplet(Plasma::Applet *applet)
 {
     m_applet = applet;
     if (!applet) {
         return;
     }
 
-    QQuickItem *i = applet->property("_plasma_graphicObject").value<QQuickItem *>();
-    if (!i) {
+    m_appletInterface = applet->property("_plasma_graphicObject").value<QQuickItem *>();
+    if (!m_appletInterface) {
         return;
     }
 
-    const QRect geom = m_applet->config().readEntry("geometry", QRect());
+    m_appletInterface->setParentItem(m_rootObject);
+    m_rootObject->setProperty("appletInterface", QVariant::fromValue(m_appletInterface.data()));
+    m_appletInterface->setVisible(true);
+    setTitle(applet->title());
+    setIcon(QIcon::fromTheme(applet->icon()));
+
+    const QSize switchSize(m_appletInterface->property("switchWidth").toInt(), m_appletInterface->property("switchHeight").toInt());
+    QRect geom = m_applet->config().readEntry("geometry", QRect());
+
     if (geom.isValid()) {
+        geom.setWidth(qMax(geom.width(), switchSize.width() + 1));
+        geom.setHeight(qMax(geom.height(), switchSize.height() + 1));
         setGeometry(geom);
     }
+    setMinimumSize(QSize(qMax((int)KIconLoader::SizeEnormous, switchSize.width() + 1),
+               qMax((int)KIconLoader::SizeEnormous, switchSize.height() + 1)));
 
-    i->setParentItem(contentItem());
-    i->setVisible(true);
-    setTitle(applet->title());
-    setIcon(QIcon::fromTheme(applet->icon()));
-
-    foreach (QObject *child, i->children()) {
+    foreach (QObject *child, m_appletInterface->children()) {
         //find for the needed property of Layout: minimum/maximum/preferred sizes and fillWidth/fillHeight
         if (child->property("minimumWidth").isValid() && child->property("minimumHeight").isValid() &&
                 child->property("preferredWidth").isValid() && child->property("preferredHeight").isValid() &&
                 child->property("maximumWidth").isValid() && child->property("maximumHeight").isValid() &&
                 child->property("fillWidth").isValid() && child->property("fillHeight").isValid()
            ) {
             m_layout = child;
         }
     }
 
     if (m_layout) {
         connect(m_layout, SIGNAL(minimumWidthChanged()), this, SLOT(minimumWidthChanged()));
         connect(m_layout, SIGNAL(minimumHeightChanged()), this, SLOT(minimumHeightChanged()));
     }
+    minimumWidthChanged();
+    minimumHeightChanged();
     QObject::connect(applet->containment(), &Plasma::Containment::configureRequested,
                      this, &PlasmaWindowedView::showConfigurationInterface);
 
     Q_ASSERT(!m_statusNotifier);
     if (m_withStatusNotifier) {
         m_statusNotifier = new KStatusNotifierItem(this);
         m_statusNotifier->setIconByName(applet->icon());
         m_statusNotifier->setTitle(applet->title());
         m_statusNotifier->setToolTipTitle(applet->title());
 
         connect(m_statusNotifier, &KStatusNotifierItem::activateRequested, this, [this](bool active, const QPoint& /*pos*/){
             setVisible(active);
             if (active) {
                 raise();
             }
         });
     }
 }
 
 void PlasmaWindowedView::resizeEvent(QResizeEvent *ev)
 {
     if (!m_applet) {
         return;
     }
 
     QQuickItem *i = m_applet->property("_plasma_graphicObject").value<QQuickItem *>();
     if (!i) {
         return;
     }
 
+    minimumWidthChanged();
+    minimumHeightChanged();
     i->setWidth(ev->size().width());
     i->setHeight(ev->size().height());
 
     contentItem()->setWidth(ev->size().width());
     contentItem()->setHeight(ev->size().height());
 
     m_applet->config().writeEntry("geometry", QRect(position(), ev->size()));
 }
 
 void PlasmaWindowedView::mouseReleaseEvent(QMouseEvent *ev)
 {
     QQuickWindow::mouseReleaseEvent(ev);
 
     if ((!(ev->buttons() & Qt::RightButton) && ev->button() != Qt::RightButton) || ev->isAccepted()) {
         return;
     }
 
     QMenu menu;
 
     foreach (QAction *action, m_applet->contextualActions()) {
         if (action) {
             menu.addAction(action);
         }
     }
 
     if (!m_applet->failedToLaunch()) {
         QAction *runAssociatedApplication = m_applet->actions()->action(QStringLiteral("run associated application"));
         if (runAssociatedApplication && runAssociatedApplication->isEnabled()) {
             menu.addAction(runAssociatedApplication);
         }
 
         QAction *configureApplet = m_applet->actions()->action(QStringLiteral("configure"));
         if (configureApplet && configureApplet->isEnabled()) {
             menu.addAction(configureApplet);
         }
     }
 
     menu.exec(ev->globalPos());
     ev->setAccepted(true);
 }
 
 void PlasmaWindowedView::moveEvent(QMoveEvent *ev)
 {
     Q_UNUSED(ev)
     m_applet->config().writeEntry("geometry", QRect(position(), size()));
 }
 
 void PlasmaWindowedView::hideEvent(QHideEvent *ev)
 {
     Q_UNUSED(ev)
     m_applet->config().sync();
     if (!m_withStatusNotifier) {
         m_applet->deleteLater();
         deleteLater();
     }
 }
 
 void PlasmaWindowedView::showConfigurationInterface(Plasma::Applet *applet)
 {
     if (m_configView) {
         m_configView->hide();
         m_configView->deleteLater();
     }
 
     if (!applet || !applet->containment()) {
         return;
     }
 
     m_configView = new PlasmaQuick::ConfigView(applet);
 
     m_configView->init();
     m_configView->show();
 }
 
 void PlasmaWindowedView::minimumWidthChanged()
 {
-    if (!m_layout) {
+    if (!m_layout || !m_appletInterface) {
         return;
     }
 
-    setMinimumWidth(m_layout->property("minimumWidth").toInt());
+    setMinimumWidth(qMax(m_appletInterface->property("switchWidth").toInt() + 1, qMax((int)KIconLoader::SizeEnormous, m_layout->property("minimumWidth").toInt())));
 }
 
 void PlasmaWindowedView::minimumHeightChanged()
 {
-    if (!m_layout) {
+    if (!m_layout || !m_appletInterface) {
         return;
     }
 
-    setMinimumHeight(m_layout->property("minimumHeight").toInt());
+    setMinimumHeight(qMax(m_appletInterface->property("switchHeight").toInt() + 1, qMax((int)KIconLoader::SizeEnormous, m_layout->property("minimumHeight").toInt())));
 }
 
 void PlasmaWindowedView::maximumWidthChanged()
 {
     if (!m_layout) {
         return;
     }
 
     setMaximumWidth(m_layout->property("maximumWidth").toInt());
 }
 
 void PlasmaWindowedView::maximumHeightChanged()
 {
     if (!m_layout) {
         return;
     }
 
     setMaximumHeight(m_layout->property("maximumHeight").toInt());
 }
 
diff --git a/plasma-windowed/plasmawindowedview.h b/plasma-windowed/plasmawindowedview.h
index e09657db6..538a37dcf 100644
--- a/plasma-windowed/plasmawindowedview.h
+++ b/plasma-windowed/plasmawindowedview.h
@@ -1,65 +1,67 @@
 /*
  * Copyright 2014  Bhushan Shah <bhush94@gmail.com>
  * Copyright 2014 Marco Martin <notmart@gmail.com>
  *
  * 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) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * 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, see <http://www.gnu.org/licenses/>
  */
 
 #ifndef PLASMAWINDOWEDVIEW_H
 #define PLASMAWINDOWEDVIEW_H
 
 #include <QQuickView>
 #include <QPointer>
 #include "plasmawindowedcorona.h"
 #include <PlasmaQuick/ConfigView>
 
 class KStatusNotifierItem;
 
 class PlasmaWindowedView : public QQuickView
 {
     Q_OBJECT
 
 public:
     PlasmaWindowedView(QWindow *parent = 0);
     ~PlasmaWindowedView() override;
 
     void setApplet(Plasma::Applet *applet);
     void setHasStatusNotifier(bool stay);
 
 protected:
     void resizeEvent(QResizeEvent * ev) override;
     void mouseReleaseEvent(QMouseEvent *ev) override;
     void moveEvent(QMoveEvent *ev) override;
     void hideEvent(QHideEvent *ev) override;
 
 protected Q_SLOTS:
     void showConfigurationInterface(Plasma::Applet *applet);
     void minimumWidthChanged();
     void minimumHeightChanged();
     void maximumWidthChanged();
     void maximumHeightChanged();
 
 
 private:
     Plasma::Applet *m_applet;
     QPointer<QObject> m_layout;
     QPointer<PlasmaQuick::ConfigView> m_configView;
+    QPointer<QQuickItem> m_rootObject;
+    QPointer<QQuickItem> m_appletInterface;
     KStatusNotifierItem* m_statusNotifier;
     bool m_withStatusNotifier;
 };
 
 #endif