diff --git a/gui/modules/adding_item/on_add_click.py b/gui/modules/adding_item/on_add_click.py
index d3a9c36..060dac3 100644
--- a/gui/modules/adding_item/on_add_click.py
+++ b/gui/modules/adding_item/on_add_click.py
@@ -17,15 +17,22 @@ def register_add_handlers(ui: Ui_MainWindow):
 
     ui.next_adding_item_button.clicked.connect(
         lambda: (
-            ui.adding_item_main_layout.setCurrentIndex(
-                (lambda x: x if x <= ui.adding_item_main_layout.count() else ui.adding_item_main_layout.count())
-                (ui.adding_item_main_layout.currentIndex() + 1)),
-            ui.new_item_finish_label.setText("Item registered. Press exit button on left side" if
+            add_item_if_can(ui),
+            ui.new_item_finish_label.setText("Press '>' button to register item" if
                                              ui.new_item_name_box.text() != "" and
-                                             ui.new_item_price_box.value() != 0
+                                             ui.new_item_price_box.value() != 0 and
+                                             ui.adding_item_main_layout.currentIndex() !=
+                                             ui.adding_item_main_layout.count() - 1 else
+                                             "Item added! Press exit button on left side" if
+                                             ui.new_item_name_box.text() != "" and
+                                             ui.new_item_price_box.value() != 0 and
+                                             ui.adding_item_main_layout.currentIndex() ==
+                                             ui.adding_item_main_layout.count() - 1
                                              else "Fill all fields first! (Image is not required)"
                                              ),
-            add_item_if_can(ui)
+            ui.adding_item_main_layout.setCurrentIndex(
+                (lambda x: x if x <= ui.adding_item_main_layout.count() else ui.adding_item_main_layout.count())
+                (ui.adding_item_main_layout.currentIndex() + 1))
         )
     )
 
diff --git a/gui/modules/adding_item/write_item.py b/gui/modules/adding_item/write_item.py
index 5161c23..c864eb8 100644
--- a/gui/modules/adding_item/write_item.py
+++ b/gui/modules/adding_item/write_item.py
@@ -8,6 +8,9 @@ def add_item_if_can(ui: Ui_MainWindow):
     if {"", 0} & {ui.new_item_name_box.text(), ui.new_item_price_box.value()}:
         return
 
+    if ui.adding_item_main_layout.currentIndex() != ui.adding_item_main_layout.count() - 1:
+        return
+
     Database.add_item(Item(
         ui.new_item_name_box.text(),
         ui.new_item_class_box.currentText(),