diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt
index af6a225b0169d6cdcec9adc494c83b6217bf1486..83ff2456d95e8b6ca0fd012d9b9b5661c9736f74 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt
@@ -48,7 +48,9 @@ abstract class ServiceBoundSettingsActivity(private val fragment: Fragment? = nu
     setSupportActionBar(toolbar)
     supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-    val fragment = this.fragment ?: this.fragment()
+    val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+                   ?: this.fragment
+                   ?: this.fragment()
     if (fragment != null) {
       val transaction = supportFragmentManager.beginTransaction()
       fragment.arguments = arguments
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt
index a9ec61804ce404cc78e8e689b38cb139bc8b1866..8ed888d19a151ae4f53f686f1acdc1d5667092b7 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt
@@ -47,7 +47,9 @@ abstract class SettingsActivity(protected val fragment: Fragment? = null) : Them
     setSupportActionBar(toolbar)
     supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
-    val fragment = this.fragment ?: this.fragment()
+    val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+                   ?: this.fragment
+                   ?: this.fragment()
     if (fragment != null) {
       val transaction = supportFragmentManager.beginTransaction()
       fragment.arguments = arguments