diff --git a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
index 1ee56eb19..86c647c3b 100644
--- a/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
+++ b/app/src/main/java/protect/card_locker/BarcodeSelectorActivity.java
@@ -119,6 +119,7 @@ public class BarcodeSelectorActivity extends AppCompatActivity
 
                 View noBarcodeButtonView = findViewById(R.id.noBarcode);
                 setButtonListener(noBarcodeButtonView, s.toString());
+                noBarcodeButtonView.setEnabled(s.length() > 0);
             }
 
             @Override
diff --git a/app/src/main/res/layout/barcode_selector_activity.xml b/app/src/main/res/layout/barcode_selector_activity.xml
index 57470480e..248087cee 100644
--- a/app/src/main/res/layout/barcode_selector_activity.xml
+++ b/app/src/main/res/layout/barcode_selector_activity.xml
@@ -64,6 +64,12 @@
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:id="@+id/barcodesLayout"/>
+            <Button
+                android:id="@+id/noBarcode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/barcodeNoBarcode"
+                android:enabled="false" />
             <LinearLayout android:orientation="horizontal"
                           android:padding="10.0dp"
                           android:layout_width="fill_parent"
@@ -196,11 +202,6 @@
                     android:contentDescription="@string/barcodeImageDescription"
                     android:layout_weight="1.0"/>
             </LinearLayout>
-            <Button
-                android:id="@+id/noBarcode"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/barcodeNoBarcode" />
         </LinearLayout>
     </ScrollView>
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa4298aea..a70b3c399 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -86,7 +86,7 @@
     <string name="app_resources"><xliff:g id="app_name">%s</xliff:g> uses the following third-party resources: <xliff:g id="app_resources_list">%s</xliff:g></string>
 
     <string name="selectBarcodeTitle">Select Barcode</string>
-    <string name="enterBarcodeInstructions">Enter the barcode value then select the image which represents the barcode you want to use</string>
+    <string name="enterBarcodeInstructions">Enter the card ID then select the image which represents the barcode you want to use, or select &#8220;This card has no barcode&#8221; to not use a barcode.</string>
 
     <string name="copy_to_clipboard_toast">Card ID copied to clipboard</string>