diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp
index 16def43bf04b87312b3aea6e7839f82367b15e62..eb96cd6249142e2d1d995cd689de5d0232628829 100644
--- a/src/libs/cplusplus/TypePrettyPrinter.cpp
+++ b/src/libs/cplusplus/TypePrettyPrinter.cpp
@@ -289,6 +289,12 @@ void TypePrettyPrinter::visit(ArrayType *type)
     acceptType(type->elementType());
 }
 
+static bool endsWithPtrOrRef(const QString &type)
+{
+    return type.endsWith(QLatin1Char('*'))
+            || type.endsWith(QLatin1Char('&'));
+}
+
 void TypePrettyPrinter::visit(Function *type)
 {
     if (_needsParens) {
@@ -309,7 +315,8 @@ void TypePrettyPrinter::visit(Function *type)
     if (_overview->showReturnTypes()) {
         const QString returnType = _overview->prettyType(type->returnType());
         if (!returnType.isEmpty()) {
-            _text.prepend(QLatin1Char(' '));
+            if (!endsWithPtrOrRef(returnType))
+                _text.prepend(QLatin1Char(' '));
             _text.prepend(returnType);
         }
     }
diff --git a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
index 1ab85cfd55ef2b6620c1053aaa0dc5fd90bf23ea..d1d1e2f5b926e2597052e0f7aedee69fd748f9aa 100644
--- a/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
+++ b/tests/auto/cplusplus/typeprettyprinter/tst_typeprettyprinter.cpp
@@ -194,6 +194,14 @@ void tst_TypePrettyPrinter::basic_data()
     // simple functions
     addRow(ptr(fnTy("foo", voidTy(), intTy())), "void (*foo)(int)", "foo");
     addRow(ptr(fnTy("foo", voidTy(), ptr(voidTy()))), "void (*foo)(void *)", "foo");
+    addRow(fnTy("foo", voidTy(), intTy()), "void foo(int)", "foo");
+    addRow(fnTy("foo", voidTy(), ptr(voidTy())), "void foo(void *)", "foo");
+
+    // functions with ptr or ref returns
+    addRow(ptr(fnTy("foo", ptr(voidTy()), intTy())), "void *(*foo)(int)", "foo");
+    addRow(ptr(fnTy("foo", ref(voidTy()), ptr(voidTy()))), "void &(*foo)(void *)", "foo");
+    addRow(fnTy("foo", ptr(voidTy()), intTy()), "void *foo(int)", "foo");
+    addRow(fnTy("foo", ref(voidTy()), ptr(voidTy())), "void &foo(void *)", "foo");
 }
 
 void tst_TypePrettyPrinter::basic()