             # if we found a file that end with the exact namespace given, we store it
             bestMatch    = null
             useBestMatch = true
+            currentClass = @parser.getCurrentClass(editor, editor.getCursorBufferPosition())
+
+            withCurrentNamespace = currentClass.replace(/(\w+)$/, term);
+            if matches.indexOf(withCurrentNamespace) != -1
+                atom.workspace.open(classMap[withCurrentNamespace], {
+                    searchAllPanes: true
+                })
+                return
+
 
             for key,value of matches
                 if value.endsWith(term)

module.exports =
class GotoClass extends AbstractGoto

    hoverEventSelectors: '.meta.inherited-class, .support.namespace, .support.class, .comment-clickable .region'
    clickEventSelectors: '.meta.inherited-class, .support.namespace, .support.class'
    gotoRegex: /^\\?[A-Z][A-za-z0-9_]*(\\[A-Z][A-Za-z0-9_])*$/

    ###*

           @$(selector).prev().hasClass('namespace') && @$(selector).hasClass('class') ||
           @$(selector).next().hasClass('class')
            return @$(selector).parent().children('.namespace, .class:not(.operator):not(.constant)')

        if @$(selector).prev().hasClass('namespace') || @$(selector).next().hasClass('inherited-class')
            return @$(selector).parent().children('.namespace, .inherited-class')

        return selector

