diff --git a/waypoint_manager/scripts/manager_GUI.py b/waypoint_manager/scripts/manager_GUI.py
index 718abae..846476c 100755
--- a/waypoint_manager/scripts/manager_GUI.py
+++ b/waypoint_manager/scripts/manager_GUI.py
@@ -381,9 +381,10 @@
         if wp_id != self.editing_waypoint_id:   # 編集中のウェイポイントを切り替え
             self.canvas.itemconfig(self.editing_waypoint_id, fill='#FDD')
             self.editing_waypoint_id = wp_id
-        self.canvas.itemconfig(wp_id, fill='red')
-        self.disp_waypoint_info(wp_id)
-        self.message("Show selected waypoint information")
+            self.canvas.itemconfig(wp_id, fill='red')
+            self.moving_waypoint = False
+            self.disp_waypoint_info(wp_id)
+            self.message("Show selected waypoint information")
         return
     
 
@@ -439,47 +440,43 @@
     +++++ ウェイポイントが左クリックされたとき、別窓で情報を表示する関数 +++++
     """
     def disp_waypoint_info(self, id):
-        point = self.waypoints.get_waypoint(id=id)
-        if (self.wp_info_win is None) or (not self.wp_info_win.winfo_exists()):
-            # ウィンドウが表示されてない場合、初期化
-            self.wp_info_win = tk.Toplevel()
-            self.wp_info_win.lower()
-            self.wp_info_win.protocol("WM_DELETE_WINDOW", self.close_wp_info)
-            # ウェイポイントファイルのキーを取得し、ラベルとテキストボックスを配置
-            for i, key in enumerate(point.keys()):
-                key_label = tk.Label(self.wp_info_win, text=key+":", width=6, font=("Consolas",15), anchor=tk.E)
-                key_label.grid(column=0, row=i, padx=2, pady=5)
-                txt_box = tk.Entry(self.wp_info_win, width=20, font=("Consolas", 15))
-                txt_box.insert(tk.END, str(point[key]).lower())
-                txt_box.grid(column=1, row=i, padx=2, pady=2, ipady=3, sticky=tk.EW)
-            # 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)
-            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)
-            dnd_btn = tk.Button(canv, text="DnD", width=5, height=1, bg="#EEE")
-            dnd_btn["command"] = lambda obj=dnd_btn: self.dnd_btn_callback(dnd_btn)
-            dnd_btn.pack(side=tk.RIGHT, anchor=tk.SE, padx=5, pady=5)
-            remove_btn = tk.Button(canv, text="Remove", width=7, height=1, bg="#F00",
-                        command=self.remove_btn_callback)
-            remove_btn.pack(side=tk.LEFT, anchor=tk.SE, padx=5, pady=5)
-            # 位置とサイズを設定
-            self.wp_info_win.update()
-            w = self.wp_info_win.winfo_width()
-            h = self.wp_info_win.winfo_height()
-            x = self.master.winfo_x() + self.canv_w - w
-            y = self.master.winfo_y() + self.canv_h - h
-            geometry = "{}x{}+{}+{}".format(w, h, x, y)
-            self.wp_info_win.geometry(geometry)
-            self.wp_info_win.lift()
-            self.wp_info_win.attributes('-topmost', True)  # サブウィンドウを最前面で固定
-        else:
-            # 既にウィンドウが表示されている場合、テキストボックスの中身を変える
-            for i, key in enumerate(point):
-                txt_box = self.wp_info_win.grid_slaves(column=1, row=i)[0]
-                txt_box.delete(0, tk.END)
-                txt_box.insert(tk.END, str(point[key]).lower())
+        point: dict = self.waypoints.get_waypoint(id=id)
+        if (self.wp_info_win is not None) and (self.wp_info_win.winfo_exists()):
+            # 既にウィンドウが表示されている場合、一度削除
+            self.wp_info_win.destroy()
+        # ウィンドウが表示されてない場合、初期化
+        self.wp_info_win = tk.Toplevel()
+        self.wp_info_win.lower()
+        self.wp_info_win.protocol("WM_DELETE_WINDOW", self.close_wp_info)
+        # ウェイポイントファイルのキーを取得し、ラベルとテキストボックスを配置
+        label_width = max([len(key) for key in point.keys()]) + 2
+        for i, key in enumerate(point.keys()):
+            key_label = tk.Label(self.wp_info_win, text=key+":", width=label_width, font=("Consolas",15), anchor=tk.E)
+            key_label.grid(column=0, row=i, padx=2, pady=5)
+            txt_box = tk.Entry(self.wp_info_win, width=20, font=("Consolas", 15))
+            txt_box.insert(tk.END, str(point[key]).lower())
+            txt_box.grid(column=1, row=i, padx=2, pady=2, ipady=3, sticky=tk.EW)
+        # 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)
+        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)
+        dnd_btn = tk.Button(canv, text="DnD", width=5, height=1, bg="#EEE")
+        dnd_btn["command"] = lambda obj=dnd_btn: self.dnd_btn_callback(dnd_btn)
+        dnd_btn.pack(side=tk.RIGHT, anchor=tk.SE, padx=5, pady=5)
+        remove_btn = tk.Button(canv, text="Remove", width=7, height=1, bg="#F00",
+                    command=self.remove_btn_callback)
+        remove_btn.pack(side=tk.LEFT, anchor=tk.SE, padx=5, pady=5)
+        # 位置とサイズを設定
+        self.wp_info_win.update()
+        w = self.wp_info_win.winfo_width()
+        h = self.wp_info_win.winfo_height()
+        x = self.canvas.winfo_x() + self.canv_w - w
+        y = self.canvas.winfo_y() + self.canv_h - h
+        self.wp_info_win.lift()
+        self.wp_info_win.attributes('-topmost', True)  # サブウィンドウを最前面で固定
+        self.wp_info_win.geometry("+{}+{}".format(x, y))
         self.wp_info_win.title("Waypoint " + str(self.waypoints.get_num(id)))   # タイトルを設定
         return