diff --git a/js/display_mode.js b/js/display_mode.js
index 8929ed1c..1fb7a456 100644
--- a/js/display_mode.js
+++ b/js/display_mode.js
@@ -191,6 +191,24 @@ display_presets = [
 			scale: [ 0.68, 0.68, 0.68 ]
 		}
 	}
+	},
+	{id: 'armor_stand', fixed: true, areas: {
+		thirdperson_righthand: {
+			rotation: [ 90, 0, 0 ],
+			translation: [ -6, -2, -4 ],
+			scale: [ 1, 1, 1 ]
+		},
+		thirdperson_lefthand: {
+			rotation: [ 90, 0, 0 ],
+			translation: [ -6, -2, -4 ],
+			scale: [ 1, 1, 1 ]
+		},
+		head: {
+			rotation: [ 0, 0, 0 ],
+			translation: [ 0, -30.4, 0 ],
+			scale: [ 1.6, 1.6, 1.6 ]
+		}
+	}
 	}
 ]
 if (localStorage.getItem('display_presets') != null) {
@@ -1634,6 +1652,7 @@ BARS.defineActions(function() {
 						case 'block': icon = 'fa-cube'; break;
 						case 'handheld': icon = 'build'; break;
 						case 'rod': icon = 'remove'; break;
+						case 'armor_stand': icon = 'icon-armor_stand'; break;
 					}
 				}
 				presets.push({
diff --git a/js/texturing/painter.js b/js/texturing/painter.js
index a711670c..9ddab667 100644
--- a/js/texturing/painter.js
+++ b/js/texturing/painter.js
@@ -17,7 +17,6 @@ const Painter = {
 			texture.saved = false
 		}
 		var instance = Painter.current.canvas;
-		Painter.current.canvas = undefined
 
 		var edit_name = options.no_undo ? null : (options.edit_name || 'Edit texture');
 
diff --git a/lang/en.json b/lang/en.json
index 59ff7beb..d3ea11bc 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1879,6 +1879,7 @@
 	"display.preset.block": "Default Block",
 	"display.preset.handheld": "Default Weapon",
 	"display.preset.rod": "Default Rod",
+	"display.preset.armor_stand": "Ground (Armor Stand)",
 
 	"preview_scene.studio": "Studio",
 	"preview_scene.minecraft_overworld": "Minecraft Overworld",