diff --git a/app/src/main/java/com/wbrawner/pihelper/AddPiHoleFragment.kt b/app/src/main/java/com/wbrawner/pihelper/AddPiHoleFragment.kt
index 22bc6f4..0821eef 100644
--- a/app/src/main/java/com/wbrawner/pihelper/AddPiHoleFragment.kt
+++ b/app/src/main/java/com/wbrawner/pihelper/AddPiHoleFragment.kt
@@ -2,9 +2,12 @@ package com.wbrawner.pihelper
 
 
 import android.os.Bundle
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ProgressBar
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.FragmentNavigatorExtras
@@ -12,7 +15,7 @@ import androidx.navigation.fragment.findNavController
 import kotlinx.android.synthetic.main.fragment_add_pi_hole.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import kotlin.coroutines.CoroutineContext
@@ -39,6 +42,21 @@ class AddPiHoleFragment : Fragment(), CoroutineScope {
         }
         connectButton.setOnClickListener {
             launch {
+                val progressDialog = AlertDialog.Builder(it.context)
+                    .setTitle(R.string.connecting_to_pihole)
+                    .setNegativeButton(R.string.action_cancel) { _, _ ->
+                        cancel()
+                    }
+                    .setView(FrameLayout(it.context).apply {
+                        addView(ProgressBar(it.context).apply {
+                            layoutParams = FrameLayout.LayoutParams(
+                                FrameLayout.LayoutParams.WRAP_CONTENT,
+                                FrameLayout.LayoutParams.WRAP_CONTENT,
+                                Gravity.CENTER
+                            )
+                        })
+                    })
+                    .show()
                 if (viewModel.connectToIpAddress(ipAddress.text.toString())) {
                     navController.navigate(
                         R.id.action_addPiHoleFragment_to_retrieveApiKeyFragment,
@@ -53,12 +71,13 @@ class AddPiHoleFragment : Fragment(), CoroutineScope {
                         .setPositiveButton(android.R.string.ok) { _, _ -> }
                         .show()
                 }
+                progressDialog.dismiss()
             }
         }
     }
 
     override fun onDestroyView() {
-        coroutineContext[Job]?.cancel()
+        cancel()
         super.onDestroyView()
     }
 }
diff --git a/app/src/main/java/com/wbrawner/pihelper/ScanNetworkFragment.kt b/app/src/main/java/com/wbrawner/pihelper/ScanNetworkFragment.kt
index e3b71b2..683284b 100644
--- a/app/src/main/java/com/wbrawner/pihelper/ScanNetworkFragment.kt
+++ b/app/src/main/java/com/wbrawner/pihelper/ScanNetworkFragment.kt
@@ -61,10 +61,10 @@ class ScanNetworkFragment : Fragment(), CoroutineScope {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        viewModel.scanningIp.observe(this, Observer {
+        viewModel.scanningIp.observe(viewLifecycleOwner, Observer {
             ipAddress?.text = it
         })
-        viewModel.piHoleIpAddress.observe(this, Observer { ipAddress ->
+        viewModel.piHoleIpAddress.observe(viewLifecycleOwner, Observer { ipAddress ->
             if (ipAddress == null) {
                 AlertDialog.Builder(view.context)
                     .setTitle(R.string.scan_failed_title)
@@ -140,7 +140,7 @@ class ScanNetworkFragment : Fragment(), CoroutineScope {
 
     override fun onDestroyView() {
         piHelperLogo.clearAnimation()
-        coroutineContext[Job]?.cancel()
+        cancel()
         super.onDestroyView()
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c8f36ae..3f240bf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,4 +44,6 @@
     <string name="action_authenticate_password">Authenticate with Password</string>
     <string name="prompt_api_key">Pi-Hole API Key</string>
     <string name="action_authenticate_api_key">Authenticate with API Key</string>
+    <string name="connecting_to_pihole">Connecting to Pi-hole…</string>
+    <string name="action_cancel">Cancel</string>
 </resources>