diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 40dbdf88f9d..a69babc770c 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -4494,6 +4494,10 @@ static void setVarIdStructMembers(Token *&tok1,
                     tok->varId(it->second);
                 }
             }
+            if (Token::Match(tok, "%name% = { . %name% =|{")) {
+                setVarIdStructMembers(tok, structMembers, varId);
+                tok = tok->linkAt(2);
+            }
             tok = tok->next();
         }
 
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
index 007e16ffb29..64b7b6664be 100644
--- a/test/testvarid.cpp
+++ b/test/testvarid.cpp
@@ -4500,7 +4500,7 @@ class TestVarID : public TestFixture {
                           "2: struct T { struct S s ; } ;\n"
                           "3: struct U { struct T t ; } ;\n"
                           "4: void f ( ) {\n"
-                          "5: struct U u@4 ; u@4 = { .@UNIQUE t@5 = { . s = { . s = 1 } } } ;\n"
+                          "5: struct U u@4 ; u@4 = { .@UNIQUE t@5 = { .@UNIQUE s@6 = { .@UNIQUE s@7 = 1 } } } ;\n"
                           "6: }\n";
         ASSERT_EQUALS(exp, tokenizeExpr(code));
     }