diff --git a/_server/editor.js b/_server/editor.js
index 823c60d8..333e938c 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -638,7 +638,7 @@ editor.prototype.drawInitData = function (icons) {
         if (img == 'autotile') {
             var autotiles = images[img];
             for (var im in autotiles) {
-                tempy += autotiles[im].height;
+                tempy += editor.uivalues.folded ? 32 : autotiles[im].height;
             }
             var tempx = editor.uivalues.folded ? 32 : 3 * 32;
             editor.widthsX[img] = [img, sumWidth / 32, (sumWidth + tempx) / 32, tempy];
@@ -748,9 +748,10 @@ editor.prototype.drawInitData = function (icons) {
             var autotiles = images[img];
             var tempx = editor.uivalues.folded ? 32 : 96;
             for (var im in autotiles) {
-                var subimgs = core.splitImage(autotiles[im], tempx, autotiles[im].height);
+                var tempy = editor.uivalues.folded ? 32 : autotiles[im].height;
+                var subimgs = core.splitImage(autotiles[im], tempx, tempy);
                 drawImage(subimgs[0], nowx, nowy, img);
-                nowy += autotiles[im].height;
+                nowy += tempy;
             }
             nowx += tempx;
             continue;
diff --git a/_server/editor_materialpanel.js b/_server/editor_materialpanel.js
index c1e73f6a..8b7b8adb 100644
--- a/_server/editor_materialpanel.js
+++ b/_server/editor_materialpanel.js
@@ -132,13 +132,18 @@ editor_materialpanel_wrapper = function (editor) {
                 var autotiles = core.material.images['autotile'];
                 if (pos.images == 'autotile') {
                     var imNames = Object.keys(autotiles);
-                    if ((pos.y + 1) * ysize > editor.widthsX[spriter][3])
-                        pos.y = ~~(editor.widthsX[spriter][3] / ysize) - 4;
-                    else {
-                        for (var i = 0; i < imNames.length; i++) {
-                            if (pos.y >= 4 * i && pos.y < 4 * (i + 1)) {
-                                pos.images = imNames[i];
-                                pos.y = 4 * i;
+                    if (editor.uivalues.folded) {
+                        pos.y = Math.min(pos.y, imNames.length - 1);
+                        pos.images = imNames[pos.y];
+                    } else {
+                        if ((pos.y + 1) * ysize > editor.widthsX[spriter][3])
+                            pos.y = ~~(editor.widthsX[spriter][3] / ysize) - 4;
+                        else {
+                            for (var i = 0; i < imNames.length; i++) {
+                                if (pos.y >= 4 * i && pos.y < 4 * (i + 1)) {
+                                    pos.images = imNames[i];
+                                    pos.y = 4 * i;
+                                }
                             }
                         }
                     }