diff --git a/layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/managers/UndoRedoManager.kt b/layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/managers/UndoRedoManager.kt
index 7ac3798000..d37b7326fc 100644
--- a/layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/managers/UndoRedoManager.kt
+++ b/layouteditor/src/main/java/org/appdevforall/codeonthego/layouteditor/managers/UndoRedoManager.kt
@@ -13,7 +13,7 @@ class UndoRedoManager(
   private val maxSize = 20
 
   /** History list to store the XMLs  */
-  private val history = arrayListOf("")
+  private val history = arrayListOf<String>()
 
   /** Index to track the current history  */
   private var index = 0
@@ -76,7 +76,7 @@ class UndoRedoManager(
      *
      * @return true if undo is enabled
      */
-    get() = index > 0
+    get() = history.size > 1 && index > 0
   val isRedoEnabled: Boolean
     /**
      * To check if Redo is enabled or not
@@ -94,6 +94,6 @@ class UndoRedoManager(
   private fun matchLastHistory(xml: String): Boolean {
     val lastIndex = history.size - 1
     if (lastIndex < 0) return false
-    return xml === history[lastIndex]
+    return xml == history[lastIndex]
   }
 }