diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 6b7fc6653..0beff6558 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -1067,6 +1067,7 @@ void Tokenizer::simplifyTypedef()
                             if (classLevel < spaceInfo.size() &&
                                 spaceInfo[classLevel].isNamespace &&
                                 spaceInfo[classLevel].className == tok2->previous()->str()) {
+                                spaceInfo[classLevel].classEnd = tok2->link();
                                 ++classLevel;
                                 pattern.clear();
                                 for (std::size_t i = classLevel; i < spaceInfo.size(); ++i)
diff --git a/test/testsimplifytypedef.cpp b/test/testsimplifytypedef.cpp
index 8cc7bd3ce..bcb6ca631 100644
--- a/test/testsimplifytypedef.cpp
+++ b/test/testsimplifytypedef.cpp
@@ -151,6 +151,7 @@ private:
         TEST_CASE(simplifyTypedef116); // ticket #5624
         TEST_CASE(simplifyTypedef117); // ticket #6507
         TEST_CASE(simplifyTypedef118); // ticket #5749
+        TEST_CASE(simplifyTypedef119); // ticket #7541
 
         TEST_CASE(simplifyTypedefFunction1);
         TEST_CASE(simplifyTypedefFunction2); // ticket #1685
@@ -2420,6 +2421,18 @@ private:
         ASSERT_EQUALS("", errout.str());
     }
 
+    void simplifyTypedef119() { // #7541
+        const char code[] = "namespace Baz {\n"
+                            "  typedef char* T1;\n"
+                            "  typedef T1 XX;\n"
+                            "}\n"
+                            "namespace Baz { }\n"
+                            "enum Bar { XX = 1 };";
+        const char exp [] = "enum Bar { XX = 1 } ;";
+        ASSERT_EQUALS(exp, tok(code, false));
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void simplifyTypedefFunction1() {
         {
             const char code[] = "typedef void (*my_func)();\n"