diff --git a/__pycache__/custom_file_dialog.cpython-312.pyc b/__pycache__/custom_file_dialog.cpython-312.pyc
index df83ad2..47fd500 100644
Binary files a/__pycache__/custom_file_dialog.cpython-312.pyc and b/__pycache__/custom_file_dialog.cpython-312.pyc differ
diff --git a/custom_file_dialog.py b/custom_file_dialog.py
index f90e747..bb857f1 100644
--- a/custom_file_dialog.py
+++ b/custom_file_dialog.py
@@ -442,6 +442,8 @@ class CustomFileDialog(tk.Toplevel):
 
         self.style_manager = StyleManager(self)
         self.widget_manager = WidgetManager(self, self.settings)
+        # After rebuilding the widgets, the binding for the Enter key must be re-established.
+        self.widget_manager.filename_entry.bind("<Return>", self.execute_search)
         self._update_view_mode_buttons()
 
         # Reset responsive button state and re-evaluate
@@ -1464,13 +1466,16 @@ class CustomFileDialog(tk.Toplevel):
     def _show_tooltip(self, event):
         if hasattr(self, 'tooltip_window') and self.tooltip_window.winfo_exists():
             return
+        
+        tooltip_text = "Suche starten" if not self.widget_manager.search_animation.running else "Suche abbrechen"
+
         x = self.widget_manager.search_animation.winfo_rootx() + 25
         y = self.widget_manager.search_animation.winfo_rooty() + 25
         self.tooltip_window = tk.Toplevel(self)
         self.tooltip_window.wm_overrideredirect(True)
         self.tooltip_window.wm_geometry(f"+{x}+{y}")
-        label = tk.Label(self.tooltip_window, text="Klicken, um die Suche zu aktivieren", 
-                         background="#333333", foreground="#FFFFFF", relief="solid", borderwidth=1)
+        # Use default system colors for consistency with other tooltips
+        label = tk.Label(self.tooltip_window, text=tooltip_text, relief="solid", borderwidth=1)
         label.pack()
 
     def _hide_tooltip(self, event):