diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
index ad2ac70646..25a068e794 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt
@@ -16,26 +16,23 @@
 
 package im.vector.app.features.debug.settings
 
-import com.airbnb.mvrx.viewModel
-import com.airbnb.mvrx.withState
 import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.R
+import im.vector.app.core.extensions.addFragment
 import im.vector.app.core.platform.VectorBaseActivity
-import im.vector.app.databinding.ActivityDebugPrivateSettingsBinding
+import im.vector.app.databinding.ActivitySimpleBinding
 
 @AndroidEntryPoint
-class DebugPrivateSettingsActivity : VectorBaseActivity<ActivityDebugPrivateSettingsBinding>() {
+class DebugPrivateSettingsActivity : VectorBaseActivity<ActivitySimpleBinding>() {
 
-    private val viewModel: DebugPrivateSettingsViewModel by viewModel()
-
-    override fun getBinding() = ActivityDebugPrivateSettingsBinding.inflate(layoutInflater)
+    override fun getBinding() = ActivitySimpleBinding.inflate(layoutInflater)
 
     override fun initUiAndData() {
-        views.forceDialPadTabDisplay.setOnCheckedChangeListener { _, isChecked ->
-            viewModel.handle(DebugPrivateSettingsViewActions.SetDialPadVisibility(isChecked))
+        if (isFirstCreation()) {
+            addFragment(
+                    R.id.simpleFragmentContainer,
+                    DebugPrivateSettingsFragment::class.java
+            )
         }
     }
-
-    override fun invalidate() = withState(viewModel) {
-        views.forceDialPadTabDisplay.isChecked = it.dialPadVisible
-    }
 }
diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
new file mode 100644
index 0000000000..c30de8ed15
--- /dev/null
+++ b/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2021 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.debug.settings
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.withState
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentDebugPrivateSettingsBinding
+
+class DebugPrivateSettingsFragment : VectorBaseFragment<FragmentDebugPrivateSettingsBinding>() {
+
+    private val viewModel: DebugPrivateSettingsViewModel by fragmentViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentDebugPrivateSettingsBinding {
+        return FragmentDebugPrivateSettingsBinding.inflate(inflater, container, false)
+    }
+
+    init {
+        setViewListeners()
+    }
+
+    private fun setViewListeners() {
+        views.forceDialPadTabDisplay.setOnCheckedChangeListener { _, isChecked ->
+            viewModel.handle(DebugPrivateSettingsViewActions.SetDialPadVisibility(isChecked))
+        }
+    }
+
+    override fun invalidate() = withState(viewModel) {
+        views.forceDialPadTabDisplay.isChecked = it.dialPadVisible
+    }
+}
diff --git a/vector/src/debug/res/layout/activity_debug_private_settings.xml b/vector/src/debug/res/layout/fragment_debug_private_settings.xml
similarity index 100%
rename from vector/src/debug/res/layout/activity_debug_private_settings.xml
rename to vector/src/debug/res/layout/fragment_debug_private_settings.xml