diff --git a/app/settings/data/layoutdata.cpp b/app/settings/data/layoutdata.cpp
index a2f858014..4ca29d4bc 100644
--- a/app/settings/data/layoutdata.cpp
+++ b/app/settings/data/layoutdata.cpp
@@ -124,7 +124,7 @@ bool Layout::isShared() const
 
 bool Layout::nameWasEdited() const
 {
-    return !m_editedName.isEmpty() && (m_editedName != m_originalName);
+    return (!m_editedName.isEmpty() && (m_editedName != m_originalName)) || id.startsWith("/tmp");
 }
 
 QString Layout::editedName() const
diff --git a/app/settings/models/layoutsmodel.cpp b/app/settings/models/layoutsmodel.cpp
index 0f8fd1280..e30172f91 100644
--- a/app/settings/models/layoutsmodel.cpp
+++ b/app/settings/models/layoutsmodel.cpp
@@ -116,20 +116,33 @@ void Layouts::appendLayout(const Settings::Data::Layout &layout)
 
 void Layouts::removeLayout(const QString &id)
 {
-    if (m_layoutsTable.contains(id)) {
-        beginInsertRows(QModelIndex(), m_layoutsTable.rowCount(), m_layoutsTable.rowCount());
-        m_layoutsTable.removeLayout(id);
+    int index = m_layoutsTable.indexOf(id);
+
+    if (index >= 0) {
+        beginRemoveRows(QModelIndex(), index, index);
+        m_layoutsTable.remove(index);
         endInsertRows();
     }
 }
 
-void Layouts::remove(const int &row)
+bool Layouts::removeRows(int row, int count, const QModelIndex &parent)
 {
-    if (m_layoutsTable.rowExists(row)) {
-        beginInsertRows(QModelIndex(), m_layoutsTable.rowCount(), m_layoutsTable.rowCount());
-        m_layoutsTable.remove(row);
-        endInsertRows();
+    Q_UNUSED(parent)
+
+    int firstRow = row;
+    int lastRow = row+count-1;
+
+    if (count > 0 && m_layoutsTable.rowExists(firstRow) && (m_layoutsTable.rowExists(lastRow))) {
+        beginRemoveRows(QModelIndex(), firstRow, lastRow);
+        for(int i=0; i<count; ++i) {
+            m_layoutsTable.remove(firstRow);
+        }
+        endRemoveRows();
+
+        return true;
     }
+
+    return false;
 }
 
 QVariant Layouts::headerData(int section, Qt::Orientation orientation, int role) const
diff --git a/app/settings/models/layoutsmodel.h b/app/settings/models/layoutsmodel.h
index cd1e434fd..1a5a1bf7f 100644
--- a/app/settings/models/layoutsmodel.h
+++ b/app/settings/models/layoutsmodel.h
@@ -84,12 +84,11 @@ public:
     const Data::Layout &at(const int &row);
 
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
 
-
-    void appendLayout(const Settings::Data::Layout &layout);
     void clear();
+    void appendLayout(const Settings::Data::Layout &layout);
     void removeLayout(const QString &id);
-    void remove(const int &row);
 
     const Data::LayoutsTable &currentData();
     void setCurrentData(Data::LayoutsTable &data);
diff --git a/app/settings/settingsdialog.cpp b/app/settings/settingsdialog.cpp
index afa120d6d..1fa3c683a 100644
--- a/app/settings/settingsdialog.cpp
+++ b/app/settings/settingsdialog.cpp
@@ -1268,8 +1268,7 @@ void SettingsDialog::updatePerLayoutButtonsState()
     }
 
     //! Remove Layout Button
-    if (originalName != nameInModel
-            || (originalName == m_corona->layoutsManager()->currentLayoutName())
+    if ((originalName == m_corona->layoutsManager()->currentLayoutName())
             || (m_corona->layoutsManager()->synchronizer()->centralLayout(originalName))
             || lockedInModel) {
         ui->removeButton->setEnabled(false);