diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp
index f2a82266297..452aa88aa41 100644
--- a/src/libs/cplusplus/ResolveExpression.cpp
+++ b/src/libs/cplusplus/ResolveExpression.cpp
@@ -978,10 +978,23 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas
             }
         } else if (accessOp == T_DOT) {
             if (replacedDotOperator) {
-                if (PointerType *ptrTy = ty->asPointerType()) {
-                    // replace . with ->
+                *replacedDotOperator = originalType->isPointerType() || ty->isPointerType();
+                // replace . with ->
+                if (PointerType *ptrTy = originalType->asPointerType()) {
+                    // case when original type is a pointer and
+                    // typedef is for type
+                    // e.g.:
+                    // typedef S SType;
+                    // SType *p;
+                    ty = ptrTy->elementType();
+                }
+                else if (PointerType *ptrTy = ty->asPointerType()) {
+                    // case when original type is a type and
+                    // typedef is for pointer of type
+                    // e.g.:
+                    // typedef S* SPTR;
+                    // SPTR p;
                     ty = ptrTy->elementType();
-                    *replacedDotOperator = true;
                 }
             }
 
diff --git a/src/plugins/cpptools/cppcompletion_test.cpp b/src/plugins/cpptools/cppcompletion_test.cpp
index 3c42969f23d..51da35ad512 100644
--- a/src/plugins/cpptools/cppcompletion_test.cpp
+++ b/src/plugins/cpptools/cppcompletion_test.cpp
@@ -1354,3 +1354,59 @@ void CppToolsPlugin::test_completion_member_access_operator_1()
     QVERIFY(completions.contains(QLatin1String("t")));
     QVERIFY(replaceAccessOperator);
 }
+
+void CppToolsPlugin::test_completion_typedef_of_type_and_replace_access_operator()
+{
+    TestData data;
+    data.srcText = "\n"
+            "struct S { int m; };\n"
+            "typedef S SType;\n"
+            "SType *p;\n"
+            "@\n"
+            "}\n"
+            ;
+    setup(&data);
+
+    Utils::ChangeSet change;
+    QString txt = QLatin1String("p.");
+    change.insert(data.pos, txt);
+    QTextCursor cursor(data.doc);
+    change.apply(&cursor);
+    data.pos += txt.length();
+
+    bool replaceAccessOperator = false;
+    QStringList completions = getCompletions(data, &replaceAccessOperator);
+
+    QCOMPARE(completions.size(), 2);
+    QVERIFY(completions.contains(QLatin1String("S")));
+    QVERIFY(completions.contains(QLatin1String("m")));
+    QVERIFY(replaceAccessOperator);
+}
+
+void CppToolsPlugin::test_completion_typedef_of_pointer_of_type_and_replace_access_operator()
+{
+    TestData data;
+    data.srcText = "\n"
+            "struct S { int m; };\n"
+            "typedef S* SPtr;\n"
+            "SPtr p;\n"
+            "@\n"
+            "}\n"
+            ;
+    setup(&data);
+
+    Utils::ChangeSet change;
+    QString txt = QLatin1String("p.");
+    change.insert(data.pos, txt);
+    QTextCursor cursor(data.doc);
+    change.apply(&cursor);
+    data.pos += txt.length();
+
+    bool replaceAccessOperator = false;
+    QStringList completions = getCompletions(data, &replaceAccessOperator);
+
+    QCOMPARE(completions.size(), 2);
+    QVERIFY(completions.contains(QLatin1String("S")));
+    QVERIFY(completions.contains(QLatin1String("m")));
+    QVERIFY(replaceAccessOperator);
+}
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index b53fe750656..b438812616d 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -114,6 +114,8 @@ private slots:
     void test_completion_instantiate_nested_class_when_enclosing_is_template();
     void test_completion_instantiate_nested_of_nested_class_when_enclosing_is_template();
     void test_completion_member_access_operator_1();
+    void test_completion_typedef_of_type_and_replace_access_operator();
+    void test_completion_typedef_of_pointer_of_type_and_replace_access_operator();
 
     void test_format_pointerdeclaration_in_simpledeclarations();
     void test_format_pointerdeclaration_in_simpledeclarations_data();