diff --git a/WeakAuras/Media/Textures/undo-highlight.blp b/WeakAuras/Media/Textures/undo-highlight.blp
new file mode 100644
index 0000000..e674650
Binary files /dev/null and b/WeakAuras/Media/Textures/undo-highlight.blp differ
diff --git a/WeakAuras/Media/Textures/undo.blp b/WeakAuras/Media/Textures/undo.blp
new file mode 100644
index 0000000..26a412e
Binary files /dev/null and b/WeakAuras/Media/Textures/undo.blp differ
diff --git a/WeakAurasOptions/OptionsFrames/TextEditor.lua b/WeakAurasOptions/OptionsFrames/TextEditor.lua
index df257e5..32e8a58 100644
--- a/WeakAurasOptions/OptionsFrames/TextEditor.lua
+++ b/WeakAurasOptions/OptionsFrames/TextEditor.lua
@@ -505,23 +505,24 @@ local function ConstructTextEditor(frame)
   editor.editBox.timeMachine = {}
   editor.editBox.timeMachinePos = 1
   local TimeMachineMaximumRollback = 10
-  --[[ Doesn't exist, we need a workaround for that
-  editor.editBox:HookScript(
+
+  -- We do not have those events in the editbox, so we created buttons for undo/redo below...
+  --[[editor.editBox:HookScript(
     "OnKeyDown",
     function(self, key)
       -- CTRL + S saves and closes
       if IsControlKeyDown() and key == "S" then
         group:Close()
-      elseif IsControlKeyDown() and key == "Z" then
-        self.ignoreNextKeyPress = true
+      elseif key == "Z" and IsControlKeyDown() then
+        self:SetPropagateKeyboardInput(false)
         if self.timeMachine[self.timeMachinePos + 1] then
           self.timeMachinePos = self.timeMachinePos + 1
           self.skipOnTextChanged = true
           originalSetText(self, self.timeMachine[self.timeMachinePos][1])
           self:SetCursorPosition(self.timeMachine[self.timeMachinePos][2])
         end
-      elseif IsControlKeyDown() and key == "Y" then
-        self.ignoreNextKeyPress = true
+      elseif key == "Y" and IsControlKeyDown() then
+        self:SetPropagateKeyboardInput(false)
         if self.timeMachine[self.timeMachinePos - 1] then
           self.timeMachinePos = self.timeMachinePos - 1
           self.skipOnTextChanged = true
@@ -530,17 +531,7 @@ local function ConstructTextEditor(frame)
         end
       end
     end
-  )
-
-  editor.editBox:HookScript(
-    "OnKeyUp",
-    function(self, key)
-      if self.ignoreNextKeyPress then
-        self.ignoreNextKeyPress = false -- Reset
-      end
-    end
-  )
-  ]]
+  )]]
 
   editor.editBox:HookScript(
     "OnTextChanged",
@@ -641,6 +632,54 @@ local function ConstructTextEditor(frame)
   editorLineText:SetText(L["Line"])
   editorLineText:SetPoint("RIGHT", editorLine, "LEFT", -8, 0)
 
+  local redoButton = CreateFrame("Button", nil, editorLine)
+  redoButton:SetPoint("RIGHT", editorLineText, "LEFT", -10, 0)
+  redoButton:SetSize(20, 20)
+  redoButton:SetNormalTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\undo")
+  local redoNormal = redoButton:GetNormalTexture()
+  redoNormal:SetAllPoints()
+  redoNormal:SetTexCoord(1, 0, 0, 1)
+  redoNormal:SetBlendMode("BLEND")
+  redoButton:SetHighlightTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\undo-highlight")
+  local redoHighlight = redoButton:GetHighlightTexture()
+  redoHighlight:SetAllPoints()
+  redoHighlight:SetTexCoord(1, 0, 0, 1)
+  redoHighlight:SetBlendMode("BLEND")
+
+  local undoButton = CreateFrame("Button", nil, redoButton)
+  undoButton:SetPoint("RIGHT", redoButton, "LEFT", -10, 0)
+  undoButton:SetSize(20, 20)
+  undoButton:SetNormalTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\undo")
+  local undoNormal = undoButton:GetNormalTexture()
+  undoNormal:SetAllPoints()
+  undoNormal:SetTexCoord(0, 1, 0, 1)
+  undoNormal:SetBlendMode("BLEND")
+  undoButton:SetHighlightTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\undo-highlight")
+  local undoHighlight = undoButton:GetHighlightTexture()
+  undoHighlight:SetAllPoints()
+  undoHighlight:SetTexCoord(0, 1, 0, 1)
+  undoHighlight:SetBlendMode("BLEND")
+
+  redoButton:SetScript("OnClick", function()
+    local self = editor.editBox
+    if self.timeMachine[self.timeMachinePos - 1] then
+      self.timeMachinePos = self.timeMachinePos - 1
+      self.skipOnTextChanged = true
+      originalSetText(self, self.timeMachine[self.timeMachinePos][1])
+      self:SetCursorPosition(self.timeMachine[self.timeMachinePos][2])
+    end
+  end)
+
+  undoButton:SetScript("OnClick", function()
+    local self = editor.editBox
+    if self.timeMachine[self.timeMachinePos + 1] then
+      self.timeMachinePos = self.timeMachinePos + 1
+      self.skipOnTextChanged = true
+      originalSetText(self, self.timeMachine[self.timeMachinePos][1])
+      self:SetCursorPosition(self.timeMachine[self.timeMachinePos][2])
+    end
+  end)
+
   helpButton:SetScript("OnClick", function()
     OptionsPrivate.ToggleTip(helpButton, group.url, L["Help"], "")
   end)