diff --git a/gui/modules/adding_item/on_add_click.py b/gui/modules/adding_item/on_add_click.py
index fbfa938..d3a9c36 100644
--- a/gui/modules/adding_item/on_add_click.py
+++ b/gui/modules/adding_item/on_add_click.py
@@ -3,24 +3,7 @@ from gui.modules.adding_item.write_item import add_item_if_can
 from data import common
 
 
-def on_add_button_click(ui: Ui_MainWindow):
-    sender_page = ui.content.currentWidget()
-
-    ui.content.setCurrentWidget(ui.add_page)
-    ui.adding_item_main_layout.setCurrentIndex(0)
-
-    ui.new_item_finish_label.setText("Fill all fields first")
-
-    ui.new_item_name_box.clear()
-    ui.new_item_price_box.setValue(0)
-    ui.new_item_class_box.clear()
-    ui.new_item_type_box.clear()
-    ui.new_item_type_box.addItem("Other")
-    ui.new_item_shop_box.clear()
-    ui.new_item_image_box.clear()
-
-    ui.new_item_class_box.addItems(common.items_class)
-    ui.new_item_class_box.setCurrentIndex(len(common.items_class) - 1)
+def register_add_handlers(ui: Ui_MainWindow):
     ui.new_item_class_box.currentIndexChanged.connect(
         lambda: (
             ui.new_item_type_box.clear(),
@@ -31,8 +14,6 @@ def on_add_button_click(ui: Ui_MainWindow):
             )
         )
     )
-    ui.new_item_shop_box.addItems(common.shop_sites)
-    ui.new_item_shop_box.setCurrentIndex(len(common.shop_sites) - 1)
 
     ui.next_adding_item_button.clicked.connect(
         lambda: (
@@ -54,4 +35,25 @@ def on_add_button_click(ui: Ui_MainWindow):
         )
     )
 
-    ui.cancel_adding_item_button.clicked.connect(lambda: ui.content.setCurrentWidget(sender_page))
+    ui.cancel_adding_item_button.clicked.connect(lambda: ui.content.setCurrentWidget(ui.main_page))
+
+
+def on_add_button_click(ui: Ui_MainWindow):
+    ui.content.setCurrentWidget(ui.add_page)
+    ui.adding_item_main_layout.setCurrentIndex(0)
+
+    ui.new_item_finish_label.setText("Fill all fields first")
+
+    ui.new_item_name_box.clear()
+    ui.new_item_price_box.setValue(0)
+    ui.new_item_class_box.clear()
+    ui.new_item_type_box.clear()
+    ui.new_item_type_box.addItem("Other")
+    ui.new_item_shop_box.clear()
+    ui.new_item_image_box.clear()
+
+    ui.new_item_class_box.addItems(common.items_class)
+    ui.new_item_class_box.setCurrentIndex(len(common.items_class) - 1)
+
+    ui.new_item_shop_box.addItems(common.shop_sites)
+    ui.new_item_shop_box.setCurrentIndex(len(common.shop_sites) - 1)
diff --git a/gui/modules/handlers/register.py b/gui/modules/handlers/register.py
index 18a1732..026a47a 100644
--- a/gui/modules/handlers/register.py
+++ b/gui/modules/handlers/register.py
@@ -11,3 +11,5 @@ def register_handlers(ui: Ui_MainWindow):
     ui.delete_item_button.clicked.connect(lambda: on_item_remove.on_rm_click(ui))
 
     ui.add_item_button.clicked.connect(lambda: on_add_click.on_add_button_click(ui))
+
+    on_add_click.register_add_handlers(ui)