1 files changed, 4 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt
index 106be5b28a..ac510d0735 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Button.kt
@@ -104,6 +104,8 @@ open class Button : FrameLayout {
     init {
         button.setOnClickListener {
             jobTracker?.newUiJob(clickJobName!!) {
+                setEnabled(false)
+
                 if (showSpinner) {
                     image.visibility = GONE
                     spinner.visibility = VISIBLE
@@ -116,6 +118,8 @@ open class Button : FrameLayout {
                 if (detailImage != null) {
                     image.visibility = VISIBLE
                 }
+
+                setEnabled(true)
             }
         }
     }