diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java
index 13be48e1dc..2dcad4f502 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/navigation/GoToQuery.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -510,7 +510,7 @@ public class GoToQuery {
 		int colonIndex = scopeName.lastIndexOf("::");
 		if (colonIndex >= 0) {
 			String parentScopeName = scopeName.substring(0, colonIndex);
-			scopeName = scopeName.substring(colonIndex + 1);
+			scopeName = scopeName.substring(colonIndex + 2);
 			parent = getScope(program, parent, parentScopeName);
 			if (parent == null) {
 				return null;