diff --git a/Sources/arm/UITrait.hx b/Sources/arm/UITrait.hx
index 22a00030..f904f392 100644
--- a/Sources/arm/UITrait.hx
+++ b/Sources/arm/UITrait.hx
@@ -557,7 +557,8 @@ class UITrait extends iron.Trait {
 		var down = iron.system.Input.getMouse().down() || iron.system.Input.getPen().down();
 		if (down && !kb.down("control")) {
 
-			if (mouse.x <= iron.App.w()) {
+			if (mouse.x < iron.App.w() && mouse.x > iron.App.x() &&
+				mouse.y < iron.App.h() && mouse.y > iron.App.y()) {
 				if (brushTime == 0 && C.undo_steps > 0) { // Paint started
 					pushUndo = true;
 					if (projectPath != "") {
@@ -1829,7 +1830,7 @@ class UITrait extends iron.Trait {
 
 				ui.separator();
 				if (ui.panel(Id.handle({selected: false}), "Project Quality", 1)) {
-					ui.combo(resHandle, ["1K", "2K", "4K", "8K", "16K", "20K"], "Res", true);
+					ui.combo(resHandle, ["1K", "2K", "4K", "8K", "16K"], "Res", true);
 					if (resHandle.changed) {
 						iron.App.notifyOnRender(Layers.resizeLayers);
 						UIView2D.inst.uvmap = null;
diff --git a/Sources/arm/renderpath/RenderPathDeferred.hx b/Sources/arm/renderpath/RenderPathDeferred.hx
index 5ff4cfc3..fb7517ca 100644
--- a/Sources/arm/renderpath/RenderPathDeferred.hx
+++ b/Sources/arm/renderpath/RenderPathDeferred.hx
@@ -181,7 +181,7 @@ class RenderPathDeferred {
 
 		var tid = arm.UITrait.inst.selectedLayer.id;
 
-		if (arm.UITrait.inst.pushUndo) {
+		if (arm.UITrait.inst.pushUndo && arm.UITrait.inst.C.undo_steps > 0) {
 			var i = arm.UITrait.inst.undoI;
 			if (arm.UITrait.inst.paintHeight) {
 				path.setTarget("texpaint_undo" + i, ["texpaint_nor_undo" + i, "texpaint_pack_undo" + i, "texpaint_opt_undo" + i]);