diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
index 72dd32e1..93611def 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
@@ -21,6 +21,8 @@ public class BaseActivity extends AppCompatActivity {
     @Inject
     public DialogProgressView mCurrentProgress;
 
+    private boolean progressOpened;
+
     @Nullable
     @Override
     public View onCreateView(@Nullable View parent, @NonNull String name, @NonNull Context context, @NonNull AttributeSet attrs) {
@@ -56,21 +58,23 @@ public class BaseActivity extends AppCompatActivity {
 
 
     protected void openProgress() {
-        runOnUiThread(() -> {
-            BarcodeManager.disable();
-            if (!this.mCurrentProgress.isVisible() && !this.mCurrentProgress.isAdded()) {
+        BarcodeManager.disable();
+        if (!progressOpened) {
+            this.progressOpened = true;
+            runOnUiThread(() -> {
                 this.mCurrentProgress.show(getSupportFragmentManager(), "tag");
-            }
-        });
+            });
+        }
     }
 
     protected void closeProgress() {
-        runOnUiThread(() -> {
-            BarcodeManager.enable();
-            if (mCurrentProgress.isVisible()) {
+        BarcodeManager.enable();
+        if (progressOpened) {
+            this.progressOpened = false;
+            runOnUiThread(() -> {
                 mCurrentProgress.dismiss();
-            }
-        });
+            });
+        }
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
index a11f7412..1b9213e6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
@@ -29,6 +29,7 @@ public abstract class BaseFragment extends Fragment {
     protected ElevatedToolbar mToolbar;
 
     protected final List<Runnable> mOnPreDestroyList = new ArrayList<>();
+    private boolean progressOpened;
 
 
     public void setScrollToolbar(ElevatedToolbar toolbar) {
@@ -81,19 +82,21 @@ public abstract class BaseFragment extends Fragment {
     }
 
     protected void openProgress() {
-        requireActivity().runOnUiThread(() -> {
-            if (!this.mCurrentProgress.isVisible() && !this.mCurrentProgress.isAdded()) {
+        if (!progressOpened) {
+            this.progressOpened = true;
+            requireActivity().runOnUiThread(() -> {
                 this.mCurrentProgress.show(requireActivity().getSupportFragmentManager(), "tag");
-            }
-        });
+            });
+        }
     }
 
     protected void closeProgress() {
-        requireActivity().runOnUiThread(() -> {
-            if (mCurrentProgress.isVisible()) {
+        if (progressOpened) {
+            this.progressOpened = false;
+            requireActivity().runOnUiThread(() -> {
                 mCurrentProgress.dismiss();
-            }
-        });
+            });
+        }
     }
 
     protected void popMe() {