diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt
index ff1375d9..2e5e9ef9 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt
@@ -78,7 +78,8 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector {
     }
 
     private fun initViewPager() {
-        wizard.adapter = ReportPagerAdapter(supportFragmentManager)
+        wizard.isUserInputEnabled = false
+        wizard.adapter = ReportPagerAdapter(this)
     }
 
     private fun subscribeObservables() {
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/adapter/ReportPagerAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/adapter/ReportPagerAdapter.kt
index cf90fee1..506d99af 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/report/adapter/ReportPagerAdapter.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/report/adapter/ReportPagerAdapter.kt
@@ -16,14 +16,14 @@
 package com.keylesspalace.tusky.components.report.adapter
 
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentPagerAdapter
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
 import com.keylesspalace.tusky.components.report.fragments.ReportDoneFragment
 import com.keylesspalace.tusky.components.report.fragments.ReportNoteFragment
 import com.keylesspalace.tusky.components.report.fragments.ReportStatusesFragment
 
-class ReportPagerAdapter(manager: FragmentManager) : FragmentPagerAdapter(manager) {
-    override fun getItem(position: Int): Fragment {
+class ReportPagerAdapter(activity: FragmentActivity) : FragmentStateAdapter(activity) {
+    override fun createFragment(position: Int): Fragment {
         return when (position) {
             0 -> ReportStatusesFragment.newInstance()
             1 -> ReportNoteFragment.newInstance()
@@ -32,5 +32,5 @@ class ReportPagerAdapter(manager: FragmentManager) : FragmentPagerAdapter(manage
         }
     }
 
-    override fun getCount(): Int = 3
+    override fun getItemCount() = 3
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/keylesspalace/tusky/view/NoSwipeViewPager.kt b/app/src/main/java/com/keylesspalace/tusky/view/NoSwipeViewPager.kt
deleted file mode 100644
index 8e470912..00000000
--- a/app/src/main/java/com/keylesspalace/tusky/view/NoSwipeViewPager.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2019 Joel Pyska
- *
- * This file is a part of Tusky.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Tusky; if not,
- * see <http://www.gnu.org/licenses>. */
-
-package com.keylesspalace.tusky.view
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.util.AttributeSet
-import android.view.MotionEvent
-import androidx.viewpager.widget.ViewPager
-
-class NoSwipeViewPager @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ViewPager(context, attrs) {
-    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-        return false
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        return false
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml
index 28c40d52..cf3bcf86 100644
--- a/app/src/main/res/layout/activity_report.xml
+++ b/app/src/main/res/layout/activity_report.xml
@@ -9,7 +9,7 @@
 
     <include layout="@layout/toolbar_basic" />
 
-    <com.keylesspalace.tusky.view.NoSwipeViewPager
+    <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/wizard"
         android:layout_width="match_parent"
         android:layout_height="match_parent"