diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
index 65e1ddb6..cf24837b 100644
--- a/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
@@ -92,9 +92,11 @@ public class MainActivity extends SyncthingActivity
 
         if (mLoadingDialog != null) {
             mLoadingDialog.dismiss();
+            mLoadingDialog = null;
         }
         if (mDisabledDialog != null) {
             mDisabledDialog.dismiss();
+            mDisabledDialog = null;
         }
         mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
         mDrawerLayout.setDrawerListener(mDrawerToggle);
diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
index 9c09ce64..69d9b199 100644
--- a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
@@ -361,7 +361,7 @@ public class SyncthingService extends Service {
      * changes.
      */
     public void registerOnApiChangeListener(OnApiChangeListener listener) {
-        // Make sure we don't send an invalid state or syncthing might shwow a "disabled" message
+        // Make sure we don't send an invalid state or syncthing might show a "disabled" message
         // when it's just starting up.
         listener.onApiChange(mCurrentState);
         mOnApiChangeListeners.add(new WeakReference<>(listener));