diff --git a/src/Entity/Media.php b/src/Entity/Media.php
index 52b7ecf..207e99c 100644
--- a/src/Entity/Media.php
+++ b/src/Entity/Media.php
@@ -20,7 +20,7 @@ use Drupal\user\UserInterface;
  *   bundle_label = @Translation("Media bundle"),
  *   handlers = {
  *     "storage" = "Drupal\media_entity\MediaStorage",
- *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "view_builder" = "Drupal\entity\EntityViewBuilder",
  *     "list_builder" = "Drupal\Core\Entity\EntityListBuilder",
  *     "access" = "Drupal\media_entity\MediaAccessController",
  *     "form" = {
diff --git a/templates/media.html.twig b/templates/media.html.twig
index 9d43771..7b2bda0 100644
--- a/templates/media.html.twig
+++ b/templates/media.html.twig
@@ -13,6 +13,8 @@
  */
 #}
 <article{{ attributes }}>
+  {{ title_suffix.contextual_links }}
+
   {% if content %}
     {{ content }}
   {% endif %}