diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index bf5a12b3f..44003a7c8 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -376,7 +376,10 @@ export default class SummaryUiHandler extends UiHandler {
           success = true;
         }
       } else if (button === Button.CANCEL) {
-        ui.setMode(Mode.PARTY);
+        if (this.summaryUiMode === SummaryUiMode.LEARN_MOVE)
+          this.hideMoveSelect();
+        else
+          ui.setMode(Mode.PARTY);
         success = true;
       } else {
         const pages = Utils.getEnumValues(Page);