diff --git a/src/brovski-adress-etiketten-verwaltung.py b/src/brovski-adress-etiketten-verwaltung.py
index 601257f..ec34e7f 100644
--- a/src/brovski-adress-etiketten-verwaltung.py
+++ b/src/brovski-adress-etiketten-verwaltung.py
@@ -311,35 +311,40 @@ class Application:
 
     def mouse_click(self, event):
         region = self.table.identify("region", event.x, event.y)
+        match region:
+            case "heading":
+                self.click_on_header(event)
+            case "cell":
+                self.click_on_cell()
 
-        if region == "heading":
-            column = self.table.identify_column(event.x)
-            match column:
-                case "#1":
-                    self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
-                    self.populate_table()
-                case "#2":
-                    self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
-                    self.populate_table()
-                case "#3":
-                    self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
-                    self.populate_table()
-                case "#4":
-                    self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
-                    self.populate_table()
-                case "#5":
-                    self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
-                    self.populate_table()
-                case _:
-                    print(column)
-            self.sort_order = not self.sort_order
+    def click_on_header(self, event):
+        column = self.table.identify_column(event.x)
+        match column:
+            case "#1":
+                self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
+                self.populate_table()
+            case "#2":
+                self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
+                self.populate_table()
+            case "#3":
+                self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
+                self.populate_table()
+            case "#4":
+                self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
+                self.populate_table()
+            case "#5":
+                self.address_list.sort(key=lambda x: x[int(column[-1]) - 1], reverse=self.sort_order)
+                self.populate_table()
+            case _:
+                print(column)
+        self.sort_order = not self.sort_order
 
-        if region == "cell":
-            self.current_record = self.table.focus()
-            values = self.table.item(self.current_record, "values")
-            entry_var_list = [self.aktiv, self.firma, self.name, self.strasse, self.plz_ort]
-            for i in range(len(values)):
-                entry_var_list[i].set(values[i])
+    def click_on_cell(self):
+        self.current_record = self.table.focus()
+        values = self.table.item(self.current_record, "values")
+        entry_var_list = [self.aktiv, self.firma, self.name, self.strasse, self.plz_ort]
+        for i in range(len(values)):
+            entry_var_list[i].set(values[i])
 
     def _load_json_file(self):
         try: