diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index e98944cc6f..8e61587e97 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -238,6 +238,12 @@ namespace OpenSim.Framework.Console
 
                 foreach (string opt in current.Keys)
                 {
+                    if (remaining > 0 && opt == s)
+                    {
+                        found.Clear();
+                        found.Add(opt);
+                        break;
+                    }
                     if (opt.StartsWith(s))
                     {
                         found.Add(opt);
@@ -301,6 +307,12 @@ namespace OpenSim.Framework.Console
 
                 foreach (string opt in current.Keys)
                 {
+                    if (opt == s)
+                    {
+                        found.Clear();
+                        found.Add(opt);
+                        break;
+                    }
                     if (opt.StartsWith(s))
                     {
                         found.Add(opt);