diff --git a/CHANGES b/CHANGES
index ab2bd65a1..d4e5f952b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -53,6 +53,7 @@ Bugs fixed
 * The caption of figure is always put on center even if ``:align:`` was specified
 * #2526: LaTeX writer crashes if the section having only images
 * #2522: Sphinx touches mo files under installed directory that caused permission error.
+* #2536: C++, fix crash when an immediately nested scope has the same name as the current scope.
 
 
 Release 1.4.1 (released Apr 12, 2016)
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py
index 6306ac901..2d28a71fb 100644
--- a/sphinx/domains/cpp.py
+++ b/sphinx/domains/cpp.py
@@ -2587,7 +2587,7 @@ class Symbol(object):
             s = s._find_named_symbol(identifier, templateParams,
                                      templateArgs, operator,
                                      templateShorthand=False,
-                                     matchSelf=True)
+                                     matchSelf=False)
             if not s:
                 return None
         return s