diff --git a/Sources/arm/renderpath/RenderPathPaint.hx b/Sources/arm/renderpath/RenderPathPaint.hx
index 331f4369..d721135f 100644
--- a/Sources/arm/renderpath/RenderPathPaint.hx
+++ b/Sources/arm/renderpath/RenderPathPaint.hx
@@ -144,6 +144,10 @@ class RenderPathPaint {
 			// tool != ToolText) {
 				return;
 		}
+		if (!arm.App.uienabled ||
+			UITrait.inst.worktab.position != 0) {
+			return;
+		}
 
 		var path = RenderPathDeferred.path;
 
diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx
index 1b32ce37..fdeb4ba1 100644
--- a/Sources/arm/ui/UITrait.hx
+++ b/Sources/arm/ui/UITrait.hx
@@ -1956,9 +1956,10 @@ class UITrait extends iron.Trait {
 				#end
 
 				for (j in 0...5) {
+					var imgw = ui.SCALE > 1 ? 100 : 50;
 					var i = j + row * 5;
 					if (i >= materials.length) {
-						@:privateAccess ui.endElement();
+						@:privateAccess ui.endElement(imgw);
 						continue;
 					}
 					var img = ui.SCALE > 1 ? materials[i].image : materials[i].imageIcon;
@@ -1974,7 +1975,6 @@ class UITrait extends iron.Trait {
 						ui.fill(w + 3,      -2,     2,   w + 4, ui.t.HIGHLIGHT_COL);
 					}
 
-					var imgw = ui.SCALE > 1 ? 100 : 50;
 					var uix = ui._x;
 					var uiy = ui._y;
 					var state = materialPreviewReady ? ui.image(img) : ui.image(Res.get('icons.png'), -1, null, imgw, imgw, imgw, imgw);