diff --git a/base/Sources/arm/ui/UIBase.hx b/base/Sources/arm/ui/UIBase.hx
index a84e188a..10a8a973 100644
--- a/base/Sources/arm/ui/UIBase.hx
+++ b/base/Sources/arm/ui/UIBase.hx
@@ -835,9 +835,6 @@ class UIBase {
 			if (mouse.started() && Config.keymap.action_paint == Config.keymap.action_rotate) {
 				action_paint_remap = Config.keymap.action_paint;
 				RenderUtil.pickPosNorTex();
-				#if kha_metal
-				RenderUtil.pickPosNorTex(); // Flush
-				#end
 				var isMesh = Math.abs(Context.raw.posXPicked) < 50 && Math.abs(Context.raw.posYPicked) < 50 && Math.abs(Context.raw.posZPicked) < 50;
 				#if kha_android
 				// Allow rotating with both pen and touch, because hovering a pen prevents touch input on android
diff --git a/base/Sources/arm/util/RenderUtil.hx b/base/Sources/arm/util/RenderUtil.hx
index 8ece08ae..df7f9c77 100644
--- a/base/Sources/arm/util/RenderUtil.hx
+++ b/base/Sources/arm/util/RenderUtil.hx
@@ -418,6 +418,10 @@ class RenderUtil {
 			arm.render.RenderPathPaint.setPlaneMesh();
 		}
 		arm.render.RenderPathPaint.commandsPaint(false);
+		#if kha_metal
+		// Flush command list
+		arm.render.RenderPathPaint.commandsPaint(false);
+		#end
 		if (Context.raw.paint2d) {
 			arm.render.RenderPathPaint.restorePlaneMesh();
 		}