diff --git a/src/Tools/dotnet-user-secrets/src/CommandLineOptions.cs b/src/Tools/dotnet-user-secrets/src/CommandLineOptions.cs
index 8495b6de9d..7d998f77d7 100644
--- a/src/Tools/dotnet-user-secrets/src/CommandLineOptions.cs
+++ b/src/Tools/dotnet-user-secrets/src/CommandLineOptions.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Extensions.SecretManager.Tools
 
         public static CommandLineOptions Parse(string[] args, IConsole console)
         {
-            var app = new CommandLineApplication()
+            var app = new CommandLineApplication(treatUnmatchedOptionsAsArguments: true)
             {
                 Out = console.Out,
                 Error = console.Error,
diff --git a/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs b/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs
index 8d62c065d9..c3633b57be 100644
--- a/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs
+++ b/src/Tools/dotnet-user-secrets/test/SecretManagerTests.cs
@@ -93,7 +93,9 @@ namespace Microsoft.Extensions.SecretManager.Tools.Tests
                             new KeyValuePair<string, string>("key1", Guid.NewGuid().ToString()),
                             new KeyValuePair<string, string>("Facebook:AppId", Guid.NewGuid().ToString()),
                             new KeyValuePair<string, string>(@"key-@\/.~123!#$%^&*())-+==", @"key-@\/.~123!#$%^&*())-+=="),
-                            new KeyValuePair<string, string>("key2", string.Empty)
+                            new KeyValuePair<string, string>("key2", string.Empty),
+                            new KeyValuePair<string, string>("-oneDashedKey", "-oneDashedValue"),
+                            new KeyValuePair<string, string>("--twoDashedKey", "--twoDashedValue")
                         };
 
             var projectPath = _fixture.GetTempSecretProject();