diff --git a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
index 6aae3f5ca..60ac03c0d 100644
--- a/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
+++ b/app/src/main/java/protect/card_locker/BarcodeImageWriterTask.java
@@ -61,6 +61,11 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         }
     }
 
+    BarcodeImageWriterTask(ImageView imageView, String cardIdString, BarcodeFormat barcodeFormat)
+    {
+        this(imageView, cardIdString, barcodeFormat, null);
+    }
+
     private int getMaxWidth(BarcodeFormat format)
     {
         switch(format)
@@ -194,8 +199,9 @@ class BarcodeImageWriterTask extends AsyncTask<Void, Void, Bitmap>
         {
             Log.i(TAG, "Barcode generation failed, removing image from display");
             imageView.setVisibility(View.GONE);
-            if (textView != null)
+            if (textView != null) {
                 textView.setVisibility(View.GONE);
+            }
         }
     }
 }
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
index da3f55fc6..6df43a8cf 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardEditActivity.java
@@ -262,14 +262,14 @@ public class LoyaltyCardEditActivity extends AppCompatActivity
                                     }
 
                                     Log.d(TAG, "ImageView size now known");
-                                    new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).execute();
+                                    new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
                                 }
                             });
                 }
                 else
                 {
                     Log.d(TAG, "ImageView size known known, creating barcode");
-                    new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).execute();
+                    new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
                 }
 
                 showBarcode();
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 78affe0fe..f91014d68 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -260,14 +260,14 @@ public class LoyaltyCardViewActivity extends AppCompatActivity
                                 barcodeImage.getViewTreeObserver().removeOnGlobalLayoutListener(this);
 
                                 Log.d(TAG, "ImageView size now known");
-                                new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).execute();
+                                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
                             }
                         });
             }
             else
             {
                 Log.d(TAG, "ImageView size known known, creating barcode");
-                new BarcodeImageWriterTask(barcodeImage, cardIdString, format, null).execute();
+                new BarcodeImageWriterTask(barcodeImage, cardIdString, format).execute();
             }
         }
         else
diff --git a/app/src/main/res/layout/loyalty_card_edit_activity.xml b/app/src/main/res/layout/loyalty_card_edit_activity.xml
index ab52249bb..b98cc5ec2 100644
--- a/app/src/main/res/layout/loyalty_card_edit_activity.xml
+++ b/app/src/main/res/layout/loyalty_card_edit_activity.xml
@@ -377,6 +377,7 @@
                             android:layout_width="match_parent"
                             android:padding="@dimen/inputPadding"
                             android:textSize="@dimen/inputSize"
+                            android:textIsSelectable="true"
                             android:layout_toEndOf="@id/barcodeTypeField"
                             android:layout_toRightOf="@id/barcodeTypeField"
                             />