diff --git a/_server/MotaActionParser.js b/_server/MotaActionParser.js
index 6f16a939..f555e202 100644
--- a/_server/MotaActionParser.js
+++ b/_server/MotaActionParser.js
@@ -123,7 +123,7 @@ ActionParser.prototype.parse = function (obj,type) {
         }
         var info = parser.getTitleAndPosition(obj.text || '');
         return MotaActionBlocks['shopsub'].xmlText([
-          obj.id,obj[0],info[1],info[3],obj.textInList,obj.mustEnable,obj.disablePreview,text_choices,next
+          obj.id,info[0],info[1],info[3],obj.textInList,obj.mustEnable,obj.disablePreview,text_choices,next
         ]);
       }
       var buildcommentevent = function(obj,parser,next){
diff --git a/_server/css/editor.css b/_server/css/editor.css
index 37f0508c..fcd06baf 100644
--- a/_server/css/editor.css
+++ b/_server/css/editor.css
@@ -154,7 +154,8 @@ body {
     height: auto;
     bottom: 0;
     margin-top: 20px;
-    overflow: hidden;
+    overflow-x: hidden;
+    overflow-y: auto;
 }
 
 #mid .tools {
diff --git a/_server/editor.js b/_server/editor.js
index 7fbbe2e9..1a1b100b 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -206,20 +206,21 @@ editor.prototype.init = function (callback) {
                     editor.file = editor_file;
                     editor_mode = editor_mode(editor);
                     editor.mode = editor_mode;
+                    var canvases = document.getElementsByClassName('gameCanvas');
+                    for (var one in canvases) {
+                        canvases[one].width = canvases[one].height = core.__PIXELS__;
+                    }
+
                     core.resetGame(core.firstData.hero, null, core.firstData.floorId, core.clone(core.initStatus.maps));
                     var lastFloorId = editor.config.get('editorLastFloorId', core.status.floorId);
                     if (core.floorIds.indexOf(lastFloorId) < 0) lastFloorId = core.status.floorId;
-                    core.changeFloor(lastFloorId, null, core.firstData.hero.loc, null, function () {
+                    core.changeFloor(lastFloorId, null, {x: 0, y: 0, direction:"up"}, null, function () {
                         afterCoreReset();
                     }, true);
                 });
             }
         
             var afterCoreReset = function () {
-                var canvases = document.getElementsByClassName('gameCanvas');
-                for (var one in canvases) {
-                    canvases[one].width = canvases[one].height = core.__PIXELS__;
-                }
                 
                 editor.game.idsInit(core.maps, core.icons.icons); // 初始化图片素材信息
                 editor.drawInitData(core.icons.icons); // 初始化绘图
@@ -463,6 +464,7 @@ editor.prototype.setLastUsedType = function (type) {
         = type == 'frequent' ? (_buildHtml('recent', '最近使用') + " | " + _buildHtml(null, '最常使用'))
         : (_buildHtml(null, '最近使用') + " | " + _buildHtml('frequent', '最常使用'));
     this.updateLastUsedMap();
+    editor.dom.lastUsedDiv.scroll(0,0);
 }
 
 editor.prototype.updateLastUsedMap = function () {
diff --git a/_server/editor_mappanel.js b/_server/editor_mappanel.js
index e11a193a..4fcafd0a 100644
--- a/_server/editor_mappanel.js
+++ b/_server/editor_mappanel.js
@@ -848,8 +848,8 @@ editor_mappanel_wrapper = function (editor) {
 
         var scrollLeft = document.documentElement.scrollLeft || document.body.scrollLeft
         var scrollTop = document.documentElement.scrollTop || document.body.scrollTop
-        var px = scrollLeft + e.clientX - editor.dom.mid2.offsetLeft - editor.dom.lastUsedDiv.offsetLeft,
-            py = scrollTop + e.clientY - editor.dom.mid2.offsetTop - editor.dom.lastUsedDiv.offsetTop;
+        var px = scrollLeft + e.clientX - editor.dom.mid2.offsetLeft - editor.dom.lastUsedDiv.offsetLeft + editor.dom.lastUsedDiv.scrollLeft,
+            py = scrollTop + e.clientY - editor.dom.mid2.offsetTop - editor.dom.lastUsedDiv.offsetTop + editor.dom.lastUsedDiv.scrollTop;
         var x = parseInt(px / 32), y = parseInt(py / 32);
         var index = x + core.__SIZE__ * y;
         if (index >= editor.uivalues.lastUsed.length) return;
@@ -880,6 +880,7 @@ editor_mappanel_wrapper = function (editor) {
             editor.uivalues.lastUsed = [];
             editor.config.set('lastUsed', []);
             editor.updateLastUsedMap();
+            editor.dom.lastUsedDiv.scroll(0,0);
         }
     }