diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java b/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
deleted file mode 100644
index 43c8989a0..000000000
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/NfcView.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.fdroid.fdroid.views.swap;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import org.fdroid.fdroid.Preferences;
-import org.fdroid.fdroid.R;
-import org.fdroid.fdroid.localrepo.SwapView;
-
-public class NfcView extends SwapView {
-
-    public NfcView(Context context) {
-        super(context);
-    }
-
-    public NfcView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public NfcView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @TargetApi(21)
-    public NfcView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        CheckBox dontShowAgain = (CheckBox) findViewById(R.id.checkbox_dont_show);
-        dontShowAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                Preferences.get().setShowNfcDuringSwap(!isChecked);
-            }
-        });
-    }
-}
diff --git a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
index 719bf0340..3ece8f188 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
@@ -506,6 +506,9 @@ public class SwapWorkflowActivity extends AppCompatActivity {
                 setUpFromWifi();
                 setUpQrScannerButton();
                 break;
+            case R.layout.swap_nfc:
+                setUpNfcView();
+                break;
         }
 
         return currentView;
@@ -1051,4 +1054,15 @@ public class SwapWorkflowActivity extends AppCompatActivity {
             });
         }
     }
+
+    private void setUpNfcView() {
+        CheckBox dontShowAgain = container.findViewById(R.id.checkbox_dont_show);
+        dontShowAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                Preferences.get().setShowNfcDuringSwap(!isChecked);
+            }
+        });
+
+    }
 }
diff --git a/app/src/full/res/layout/swap_nfc.xml b/app/src/full/res/layout/swap_nfc.xml
index 01c9533be..454ceee21 100644
--- a/app/src/full/res/layout/swap_nfc.xml
+++ b/app/src/full/res/layout/swap_nfc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.fdroid.fdroid.views.swap.NfcView
+<org.fdroid.fdroid.localrepo.SwapView
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:swap="http://schemas.android.com/apk/res-auto"
         swap:toolbarTitle="@string/swap_nfc_title"
@@ -35,4 +35,4 @@
             android:layout_below="@+id/text_description"
             android:layout_centerHorizontal="true"/>
 
-</org.fdroid.fdroid.views.swap.NfcView>
\ No newline at end of file
+</org.fdroid.fdroid.localrepo.SwapView>
\ No newline at end of file