diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 4ab07fd2..b238a8c8 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1054,7 +1054,7 @@ function create_keydrive_master {
 
 function create_keydrive_fragment {
     select_user
-    if [ ! $SELECTED_USERNAME ]; then
+    if [ ! "$SELECTED_USERNAME" ]; then
         return
     fi
     dialog --title $"USB Fragment Keydrive" \
@@ -1415,6 +1415,7 @@ function format_drive {
 
 function remove_backups {
     detect_usb_drive
+    # shellcheck disable=SC2154
     dialog --title $"Remove backups from a USB drive $USB_DRIVE" \
            --backtitle $"Freedombone Control Panel" \
            --defaultno \