diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 7959c2d..58c6195 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -6,12 +6,12 @@
         <type value="RUNNING_DEVICE_TARGET" />
         <deviceKey>
           <Key>
-            <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="$USER_HOME$/.android/avd/Pixel_4_API_31.avd" />
+            <type value="SERIAL_NUMBER" />
+            <value value="RF8M331ZLCH" />
           </Key>
         </deviceKey>
       </Target>
     </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-07-27T08:10:43.341834Z" />
+    <timeTargetWasSelectedWithDropDown value="2022-07-27T09:21:51.480343Z" />
   </component>
 </project>
\ No newline at end of file
diff --git a/filestack/build.gradle b/filestack/build.gradle
index f82795b..a6d4943 100644
--- a/filestack/build.gradle
+++ b/filestack/build.gradle
@@ -75,7 +75,7 @@ afterEvaluate {
 
                 groupId = 'com.github.boykod'
                 artifactId = 'smartsuite-filestack'
-                version = '0.1.0'
+                version = '0.1.1'
             }
         }
     }
diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/FilestackActivity.kt b/filestack/src/main/java/ua/motionman/filestack/ui/FilestackActivity.kt
index b16a2c3..28a4ccc 100644
--- a/filestack/src/main/java/ua/motionman/filestack/ui/FilestackActivity.kt
+++ b/filestack/src/main/java/ua/motionman/filestack/ui/FilestackActivity.kt
@@ -2,6 +2,8 @@ package ua.motionman.filestack.ui
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
+import androidx.navigation.findNavController
+import ua.motionman.filestack.R
 import ua.motionman.filestack.databinding.FilestackActivityBinding
 import ua.motionman.filestack.utils.client.ClientProvider
 import ua.motionman.filestack.utils.delegate.viewBinding
@@ -27,6 +29,17 @@ class FilestackActivity : AppCompatActivity() {
         }
     }
 
+    override fun onBackPressed() {
+        val currentDestinationId = findNavController(R.id.nav_host_fragment).currentDestination?.id
+
+        if (currentDestinationId != null) {
+            when (currentDestinationId) {
+                R.id.uploadingProgressFragment -> {}
+                else -> super.onBackPressed()
+            }
+        }
+    }
+
     companion object {
         const val API_KEY = "api_key"
         const val POLICY_KEY = "policy_key"
diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressFragment.kt b/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressFragment.kt
index 578633f..8ab2e44 100644
--- a/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressFragment.kt
+++ b/filestack/src/main/java/ua/motionman/filestack/ui/uploadingprogress/UploadingProgressFragment.kt
@@ -4,7 +4,6 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import androidx.activity.addCallback
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
@@ -28,7 +27,6 @@ class UploadingProgressFragment : Fragment(R.layout.uploading_progress) {
         setupListeners()
         initFlowSubscriber()
         startUploadService()
-        disableOnBackPress()
     }
 
     private fun setupListeners() {
@@ -71,12 +69,6 @@ class UploadingProgressFragment : Fragment(R.layout.uploading_progress) {
         activity?.finish()
     }
 
-    private fun disableOnBackPress() {
-        activity?.onBackPressedDispatcher?.addCallback {
-            // do nothing
-        }
-    }
-
     companion object {
         const val SELECTIONS_KEY = "selections_bundle_key"
     }