diff --git a/app/settings/settingsdialog/layoutscontroller.cpp b/app/settings/settingsdialog/layoutscontroller.cpp
index 4d3f93c38..13db8b7e9 100644
--- a/app/settings/settingsdialog/layoutscontroller.cpp
+++ b/app/settings/settingsdialog/layoutscontroller.cpp
@@ -250,8 +250,10 @@ void Layouts::applyColumnWidths()
     }
 
     if (m_model->inMultipleMode()) {
+        m_view->setColumnHidden(Model::Layouts::MENUCOLUMN, true);
         m_view->setColumnHidden(Model::Layouts::ACTIVITYCOLUMN, false);
     } else {
+        m_view->setColumnHidden(Model::Layouts::MENUCOLUMN, false);
         m_view->setColumnHidden(Model::Layouts::ACTIVITYCOLUMN, true);
     }
 
diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp
index 90171cfdb..7f209b56f 100644
--- a/containmentactions/contextmenu/menu.cpp
+++ b/containmentactions/contextmenu/menu.cpp
@@ -250,59 +250,57 @@ void Menu::populateLayouts()
 {
     m_switchLayoutsMenu->clear();
 
-    if (m_data.size() >= LAYOUTSPOS + 1) {
-        LayoutsMemoryUsage memoryUsage = static_cast<LayoutsMemoryUsage>((m_data[0]).toInt());
-        QStringList currentNames = m_data[1].split(";;");
-
-        bool hasActiveNoCurrentLayout{false};
-
-        if (memoryUsage == LayoutsMemoryUsage::MultipleLayouts) {
-            for (int i = LAYOUTSPOS; i < m_data.size(); ++i) {
-                QString layout = m_data[i].right(m_data[i].length() - 2);
-                if (!currentNames.contains(layout)) {
-                    hasActiveNoCurrentLayout = true;
-                    break;
-                }
-            }
-        }
+    LayoutsMemoryUsage memoryUsage = static_cast<LayoutsMemoryUsage>((m_data[0]).toInt());
+    QStringList currentNames = m_data[1].split(";;");
 
-        for (int i = LAYOUTSPOS; i < m_data.size(); ++i) {
-            bool isActive = m_data[i].startsWith("0") ? false : true;
+    bool hasActiveNoCurrentLayout{false};
 
+    if (memoryUsage == LayoutsMemoryUsage::MultipleLayouts) {
+        for (int i = LAYOUTSPOS; i < m_data.size(); ++i) {
             QString layout = m_data[i].right(m_data[i].length() - 2);
-            QString layoutText = layout;
+            if (!currentNames.contains(layout)) {
+                hasActiveNoCurrentLayout = true;
+                break;
+            }
+        }
+    }
 
-            bool isCurrent = ((memoryUsage == SingleLayout && isActive)
-                              || (memoryUsage == MultipleLayouts && currentNames.contains(layout)));
+    for (int i = LAYOUTSPOS; i < m_data.size(); ++i) {
+        bool isActive = m_data[i].startsWith("0") ? false : true;
 
-            if (isCurrent && hasActiveNoCurrentLayout) {
-                layoutText += QString(" " + i18nc("current layout", "[Current]"));
-            }
+        QString layout = m_data[i].right(m_data[i].length() - 2);
+        QString layoutText = layout;
 
-            QAction *layoutAction = m_switchLayoutsMenu->addAction(layoutText);
+        bool isCurrent = ((memoryUsage == SingleLayout && isActive)
+                          || (memoryUsage == MultipleLayouts && currentNames.contains(layout)));
 
-            if (memoryUsage == LayoutsMemoryUsage::SingleLayout) {
-                layoutAction->setCheckable(true);
+        if (isCurrent && hasActiveNoCurrentLayout) {
+            layoutText += QString(" " + i18nc("current layout", "[Current]"));
+        }
 
-                if (isActive) {
-                    layoutAction->setChecked(true);
-                } else {
-                    layoutAction->setChecked(false);
-                }
-            }
+        QAction *layoutAction = m_switchLayoutsMenu->addAction(layoutText);
 
-            layoutAction->setData(layout);
+        if (memoryUsage == LayoutsMemoryUsage::SingleLayout) {
+            layoutAction->setCheckable(true);
 
-            if (isCurrent) {
-                QFont font = layoutAction->font();
-                font.setBold(true);
-                layoutAction->setFont(font);
+            if (isActive) {
+                layoutAction->setChecked(true);
+            } else {
+                layoutAction->setChecked(false);
             }
         }
 
-        m_switchLayoutsMenu->addSeparator();
+        layoutAction->setData(layout);
+
+        if (isCurrent) {
+            QFont font = layoutAction->font();
+            font.setBold(true);
+            layoutAction->setFont(font);
+        }
     }
 
+    m_switchLayoutsMenu->addSeparator();
+
     QAction *editLayoutsAction = m_switchLayoutsMenu->addAction(i18n("Manage &Layouts..."));
     editLayoutsAction->setData(QStringLiteral(" _show_latte_settings_dialog_"));
 }