diff --git a/libs/actions.js b/libs/actions.js
index 75a43b8b..b3885841 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -1253,7 +1253,7 @@ actions.prototype._clickShop = function (x, y) {
 
 actions.prototype._keyDownShop = function (keycode) {
     // 商店界面长按空格连续购买
-    if (keycode == 32) {
+    if (keycode == 32 && core.status.event.selection != core.status.event.data.shop.choices.length) {
         this._selectChoices(core.status.event.data.shop.choices.length + 1, keycode, this._clickShop);
         return;
     }
@@ -1266,7 +1266,7 @@ actions.prototype._keyUpShop = function (keycode) {
         core.events._exitShop();
         return;
     }
-    if (keycode != 32) {
+    if (keycode != 32 || core.status.event.selection == core.status.event.data.shop.choices.length) {
         this._selectChoices(core.status.event.data.shop.choices.length + 1, keycode, this._clickShop);
         return;
     }
diff --git a/libs/ui.js b/libs/ui.js
index 6f990152..d67f17db 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -2032,7 +2032,7 @@ ui.prototype._drawEquipbox_description = function (info, max_height) {
     this._drawEquipbox_drawStatusChanged(info, curr, equip, equipType);
 }
 
-ui.prototype._drawEquipbox_getStatusChanged = function (info, equip, equipType) {
+ui.prototype._drawEquipbox_getStatusChanged = function (info, equip, equipType, y) {
     var compare, differentMode = null;
     if (info.index < this.LAST) compare = core.compareEquipment(null, info.selectId);
     else {
@@ -2053,7 +2053,7 @@ ui.prototype._drawEquipbox_getStatusChanged = function (info, equip, equipType)
 }
 
 ui.prototype._drawEquipbox_drawStatusChanged = function (info, y, equip, equipType) {
-    var compare = this._drawEquipbox_getStatusChanged(info, equip, equipType);
+    var compare = this._drawEquipbox_getStatusChanged(info, equip, equipType, y);
     if (compare == null) return;
     var obj = { drawOffset: 10, y: y };