diff --git a/waypoint_manager/scripts/manager_GUI.py b/waypoint_manager/scripts/manager_GUI.py
index 395af33..2e25141 100755
--- a/waypoint_manager/scripts/manager_GUI.py
+++ b/waypoint_manager/scripts/manager_GUI.py
@@ -271,7 +271,7 @@
     """
     def menu_set_finishpose(self, event=None):
         if not self.waypoints: return
-        self.message("Click any point to set finsih pose")
+        self.message("Click any point to set finsih pose. If you want to cancel, right click anywhere.")
         self.setting_finish_pose = 1
         return
 
@@ -530,7 +530,7 @@
         new_param_btn.grid(column=0, columnspan=2, row=self.wp_info_win.grid_size()[1], pady=10)
         # Apply, DnD(Drag & Drop), remove ボタン
         canv = tk.Canvas(self.wp_info_win)
-        canv.grid(column=0, columnspan=2, row=self.wp_info_win.grid_size()[1], sticky=tk.EW, pady=5)
+        canv.grid(column=0, columnspan=3, row=self.wp_info_win.grid_size()[1], sticky=tk.EW, pady=5)
         apply_btn = tk.Button(canv, text="Apply", width=5, height=1, bg="#FDD",
                     command=self.apply_btn_callback)
         apply_btn.pack(side=tk.RIGHT, anchor=tk.SE, padx=5, pady=5)
@@ -877,7 +877,15 @@
     """
     def right_click(self, event):
         if not self.mymap: return
-        if self.setting_finish_pose != 0: return
+        if self.setting_finish_pose == 1:
+            self.setting_finish_pose = 0
+            self.message("Canceled.")
+            return
+        if self.setting_finish_pose == 2:
+            self.canvas.delete("set_finish_pose")
+            self.setting_finish_pose = 0
+            self.message("Canceled.")
+            return
         # クリックした座標の近くにあるオブジェクトを取得
         clicked_obj = self.canvas.find_enclosed(event.x-20, event.y-20, event.x+20, event.y+20)
         if clicked_obj:   # 何かオブジェクトがクリックされていた場合