diff --git a/app/view/contextmenu.cpp b/app/view/contextmenu.cpp
index f82d7388d..a36a35da0 100644
--- a/app/view/contextmenu.cpp
+++ b/app/view/contextmenu.cpp
@@ -577,10 +577,6 @@ void ContextMenu::addContainmentActions(QMenu *desktopMenu, QEvent *event)
         }
     }
 
-    if (actions.count() > 0) {
-        desktopMenu->addSection(QString("Latte"));
-    }
-
     desktopMenu->addActions(actions);
 
     return;
diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
index 7b394567f..df3f40824 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -72,8 +72,9 @@ Menu::Menu(QObject *parent, const QVariantList &args)
 
 Menu::~Menu()
 {
-    m_separator1->deleteLater();
-    m_separator2->deleteLater();
+    m_sectionAction->deleteLater();
+    m_separator->deleteLater();
+
     m_addWidgetsAction->deleteLater();
     m_configureAction->deleteLater();
     m_printAction->deleteLater();
@@ -86,10 +87,12 @@ Menu::~Menu()
 
 void Menu::makeActions()
 {
-    m_separator1 = new QAction(this);
-    m_separator1->setSeparator(true);
-    m_separator2 = new QAction(this);
-    m_separator2->setSeparator(true);
+    m_sectionAction = new QAction(this);
+    m_sectionAction->setSeparator(true);
+    m_sectionAction->setText("Latte");
+
+    m_separator = new QAction(this);
+    m_separator->setSeparator(true);
 
     //! Print Message...
     m_printAction = new QAction(QIcon::fromTheme("edit"), "Print Message...", this);
@@ -202,13 +205,13 @@ QList<QAction *> Menu::contextualActions()
 {
     QList<QAction *> actions;
 
-    actions << m_separator1;
+    actions << m_sectionAction;
     //actions << m_printAction;
     actions << m_layoutsAction;
     actions << m_preferenceAction;
     actions << m_quitApplication;
 
-    actions << m_separator2;
+    actions << m_separator;
     actions << m_addWidgetsAction;
     actions << m_duplicateAction;
     actions << m_exportViewAction;
diff --git a/containmentactions/contextmenu/menu.h b/containmentactions/contextmenu/menu.h
index b4c767964..cf4eceb59 100644
--- a/containmentactions/contextmenu/menu.h
+++ b/containmentactions/contextmenu/menu.h
@@ -55,8 +55,8 @@ private:
 
     QList<QAction *>m_actions;
 
-    QAction *m_separator1{nullptr};
-    QAction *m_separator2{nullptr};
+    QAction *m_sectionAction{nullptr};
+    QAction *m_separator{nullptr};
 
     QAction *m_addWidgetsAction{nullptr};
     QAction *m_configureAction{nullptr};
diff --git a/plasmoid/package/contents/ui/ContextMenu.qml b/plasmoid/package/contents/ui/ContextMenu.qml
index b9de0732a..c932116b7 100644
--- a/plasmoid/package/contents/ui/ContextMenu.qml
+++ b/plasmoid/package/contents/ui/ContextMenu.qml
@@ -82,8 +82,9 @@ PlasmaComponents.ContextMenu {
         return tasksModel.data(modelIndex, modelProp)
     }
 
-    function show() {       
+    function show() {
         loadDynamicLaunchActions(visualParent.m.LauncherUrlWithoutIcon);
+        loadMyViewActions();
         // backend.ungrabMouse(visualParent);
         openRelative();
 
@@ -299,6 +300,23 @@ PlasmaComponents.ContextMenu {
         }
     }
 
+    function loadMyViewActions() {
+        if (!appletAbilities.myView.isReady) {
+            return;
+        }
+
+        var actionsCount = appletAbilities.myView.containmentActions.length;
+
+        for (var i=0; i<actionsCount; ++i) {
+            var item = newMenuItem(menu);
+            item.action = appletAbilities.myView.containmentActions[i];
+            item.visible = Qt.binding(function() {
+                return this.action.visible;
+            });
+            menu.addMenuItem(item, myViewActions);
+        }
+    }
+
     ///REMOVE
     function updateOnAllActivitiesLauncher(){
         //isOnAllActivitiesLauncher = ActivitiesTools.isOnAllActivities(visualParent.m.LauncherUrlWithoutIcon);
@@ -321,7 +339,7 @@ PlasmaComponents.ContextMenu {
     }
 
 
-    Component.onDestruction: {        
+    Component.onDestruction: {
         if (!changingLayout) {
             root.contextMenu = null;
             backend.ungrabMouse(visualParent);
@@ -817,13 +835,8 @@ PlasmaComponents.ContextMenu {
 
     //////END OF NEW ARCHITECTURE
 
-    /*PlasmaComponents.MenuItem {
-        separator: true
-        visible: root.inEditMode
-    }*/
-
     PlasmaComponents.MenuItem {
-        id: addInternalSeparatorItem       
+        id: addInternalSeparatorItem
         enabled: !visualParent.tailItemIsSeparator || !visualParent.headItemIsSeparator
         visible: visualParent.hasShownLauncher
         icon: "add"
@@ -879,100 +892,24 @@ PlasmaComponents.ContextMenu {
     }
 
     PlasmaComponents.MenuItem {
-        //text: i18n("Configure")
-        //section: true
+        id: myViewActions
         separator: true
-        visible: preferenceMenuItem.visible
-    }
-
-    /* PlasmaComponents.MenuItem {
-        separator: true
-        visible: root.inEditMode
-    }*/
-
-    PlasmaComponents.MenuItem {
-        text: "Latte"
-        section: true
-        visible: appletAbilities.myView.isReady
-    }
-
-    PlasmaComponents.MenuItem {
-        id: layoutsMenuItem
-        action: appletAbilities.myView.isReady ?  appletAbilities.myView.action("layouts") : plasmoid.action("configure")
-        enabled: visible
-    }
-
-    PlasmaComponents.MenuItem {
-        id: preferenceMenuItem
-        action: appletAbilities.myView.isReady ?  appletAbilities.myView.action("preferences") : plasmoid.action("configure")
-        visible: appletAbilities.myView.isReady
-    }
-
-    PlasmaComponents.MenuItem {
-        id: quitApplicationItem
-        action: appletAbilities.myView.isReady ? appletAbilities.myView.action("quit latte") : plasmoid.action("configure")
-        visible: appletAbilities.myView.isReady
+        visible: false
     }
 
     PlasmaComponents.MenuItem {
         separator: true
-        visible: preferenceMenuItem.visible
+        visible: removePlasmoidInMyViewEditMode.visible
     }
 
     PlasmaComponents.MenuItem {
-        id: addWidgets
-        action: appletAbilities.myView.isReady ? appletAbilities.myView.action("add latte widgets") : plasmoid.action("configure");
-        visible:  appletAbilities.myView.isReady && action.visible
-    }
-
-    PlasmaComponents.MenuItem {
-        id: duplicateItem
-        action: appletAbilities.myView.isReady ? appletAbilities.myView.action("duplicate view") : plasmoid.action("configure")
-        visible:  appletAbilities.myView.isReady && action.visible
-    }
-
-    PlasmaComponents.MenuItem {
-        id: exportItem
-        action: appletAbilities.myView.isReady ? appletAbilities.myView.action("export view") : plasmoid.action("configure")
-        visible:  appletAbilities.myView.isReady && action.visible
-    }
-
-    PlasmaComponents.MenuItem {
-        id: configureItem
-        action: appletAbilities.myView.isReady ? appletAbilities.myView.action("edit view") : plasmoid.action("configure")
-        visible:  appletAbilities.myView.isReady && action.visible
-    }
-
-    PlasmaComponents.MenuItem {
-        id: removeItem
-        action: appletAbilities.myView.isReady ? appletAbilities.myView.action("remove view") : plasmoid.action("remove")
-        visible:  appletAbilities.myView.isReady && action.visible
-    }
-
-    //! BEGIN: Plasmoid actions when it isnt inside a Latte dock
-    PlasmaComponents.MenuItem {
-        id: configurePlasmoid
-        visible: !appletAbilities.myView.isReady && !plasmoid.immutable
-
-        text: plasmoid.action("configure").text
-        icon: plasmoid.action("configure").icon
-
-        onClicked: plasmoid.action("configure").trigger();
-    }
-    //! END: Plasmoid actions when it isnt inside a Latte dock
-
-    PlasmaComponents.MenuItem {
-        separator: true
-        visible: removePlasmoid.visible
-    }
-
-    PlasmaComponents.MenuItem {
-        id: removePlasmoid
-        visible: (appletAbilities.myView.isReady && appletAbilities.myView.inEditMode)
-                 || (!root.latteBridge && !plasmoid.immutable /*normal plasmoid in the desktop*/)
-
+        id: removePlasmoidInMyViewEditMode
+        //! Workaround: this is preferred compared to:
+        //!   action:plasmoid.action("remove")
+        //! which shows the action always and not dependent of myView.inEditMode flag
         text: plasmoid.action("remove").text
         icon: plasmoid.action("remove").icon
+        visible: appletAbilities.myView.isReady && appletAbilities.myView.inEditMode
 
         onClicked: plasmoid.action("remove").trigger();
     }