diff --git a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
index 79c85f8fd36c2871d94d9605befab799471234d6..e7fed4b16a2b3034a14bc7a3b362c0a2a36e5180 100644
--- a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
@@ -267,7 +267,7 @@ class DebuggerUtility
             $domainObjectType = 'object';
         }
         if ($plainText) {
-            $dump .= ' ' . self::ansiEscapeWrap(($persistenceType . ' ' . $domainObjectType), '42;30', $ansiColors);
+            $dump .= ' ' . self::ansiEscapeWrap((($persistenceType ? $persistenceType . ' ' : '') . $domainObjectType), '42;30', $ansiColors);
         } else {
             $dump .= '<span class="extbase-debug-ptype">' . ($persistenceType ? $persistenceType . ' ' : '') . $domainObjectType . '</span>';
         }
@@ -335,6 +335,12 @@ class DebuggerUtility
                 }
                 $dump .= PHP_EOL . str_repeat(self::PLAINTEXT_INDENT, $level) . ($plainText ? '' : '<span class="extbase-debug-property">') . self::ansiEscapeWrap($property->getName(), '37', $ansiColors) . ($plainText ? '' : '</span>') . ' => ';
                 $property->setAccessible(true);
+                $visibility = ($property->isProtected() ? 'protected' : ($property->isPrivate() ? 'private' : 'public'));
+                if ($plainText) {
+                    $dump .= ' ' . self::ansiEscapeWrap($visibility, '42;30', $ansiColors) . ' ';
+                } else {
+                    $dump .= '<span class="extbase-debug-visibility">' . $visibility . '</span>';
+                }
                 $dump .= self::renderDump($property->getValue($object), $level, $plainText, $ansiColors);
                 if ($object instanceof \TYPO3\CMS\Extbase\DomainObject\AbstractDomainObject && !$object->_isNew() && $object->_isDirty($property->getName())) {
                     if ($plainText) {
@@ -343,8 +349,6 @@ class DebuggerUtility
                         $dump .= '<span class="extbase-debug-dirty">modified</span>';
                     }
                 }
-                $visibility = ($property->isProtected() ? 'protected' : ($property->isPrivate() ? 'private' : 'public'));
-                $dump .= '<span class="extbase-debug-visibility">' . $visibility . '</span>';
             }
         }
         return $dump;