diff --git a/src/ProfileViewBuilder.php b/src/ProfileViewBuilder.php
index d5916f5..69c25e5 100644
--- a/src/ProfileViewBuilder.php
+++ b/src/ProfileViewBuilder.php
@@ -4,6 +4,7 @@ namespace Drupal\profile;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityViewBuilder;
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 
 /**
  * Render controller for profile entities.
@@ -19,4 +20,17 @@ class ProfileViewBuilder extends EntityViewBuilder {
     return $defaults;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterBuild(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
+    /** @var \Drupal\profile\Entity\Profile $entity */
+    parent::alterBuild($build, $entity, $display, $view_mode);
+    if ($entity->id()) {
+      $build['#contextual_links']['profile'] = [
+        'route_parameters' => ['profile' => $entity->id()],
+      ];
+    }
+  }
+
 }
diff --git a/templates/profile.html.twig b/templates/profile.html.twig
index 08966d2..2d4688e 100644
--- a/templates/profile.html.twig
+++ b/templates/profile.html.twig
@@ -20,5 +20,6 @@
  */
 #}
 <div{{ attributes }}>
+  {{ title_suffix }}
   {{ content }}
 </div>