diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c
index 1b07ec64cda..49ec66ed07d 100644
--- a/boot/freeldr/freeldr/options.c
+++ b/boot/freeldr/freeldr/options.c
@@ -179,31 +179,32 @@ VOID DoOptionsMenu(IN OperatingSystemItem* OperatingSystem)
 
 VOID DisplayBootTimeOptions(VOID)
 {
-    CHAR BootOptions[260] = "";
+    CHAR BootOptions[260];
 
     switch (BootOptionChoice)
     {
         case SAFE_MODE:
-            strcat(BootOptions, OptionsMenuList[0]);
+            strcpy(BootOptions, OptionsMenuList[0]);
             break;
 
         case SAFE_MODE_WITH_NETWORKING:
-            strcat(BootOptions, OptionsMenuList[1]);
+            strcpy(BootOptions, OptionsMenuList[1]);
             break;
 
         case SAFE_MODE_WITH_COMMAND_PROMPT:
-            strcat(BootOptions, OptionsMenuList[2]);
+            strcpy(BootOptions, OptionsMenuList[2]);
             break;
 
         case LAST_KNOWN_GOOD_CONFIGURATION:
-            strcat(BootOptions, OptionsMenuList[6]);
+            strcpy(BootOptions, OptionsMenuList[6]);
             break;
 
         case DIRECTORY_SERVICES_RESTORE_MODE:
-            strcat(BootOptions, OptionsMenuList[7]);
+            strcpy(BootOptions, OptionsMenuList[7]);
             break;
 
         default:
+            BootOptions[0] = ANSI_NULL;
             break;
     }
 
@@ -213,31 +214,23 @@ VOID DisplayBootTimeOptions(VOID)
              (BootOptionChoice != SAFE_MODE_WITH_NETWORKING) &&
              (BootOptionChoice != SAFE_MODE_WITH_COMMAND_PROMPT) )
         {
-            if (BootOptionChoice != NO_OPTION)
-            {
+            if (BootOptions[0] != ANSI_NULL)
                 strcat(BootOptions, ", ");
-            }
             strcat(BootOptions, OptionsMenuList[4]);
         }
     }
 
     if (VgaMode)
     {
-        if ((BootOptionChoice != NO_OPTION) ||
-             BootLogging)
-        {
+        if (BootOptions[0] != ANSI_NULL)
             strcat(BootOptions, ", ");
-        }
         strcat(BootOptions, OptionsMenuList[5]);
     }
 
     if (DebuggingMode)
     {
-        if ((BootOptionChoice != NO_OPTION) ||
-             BootLogging || VgaMode)
-        {
+        if (BootOptions[0] != ANSI_NULL)
             strcat(BootOptions, ", ");
-        }
         strcat(BootOptions, OptionsMenuList[8]);
     }