diff --git a/src/Entity/Widget.php b/src/Entity/Widget.php
index aa11fad..1a34c4a 100644
--- a/src/Entity/Widget.php
+++ b/src/Entity/Widget.php
@@ -19,7 +19,7 @@ use Drupal\user\UserInterface;
  *   label = @Translation("Widget"),
  *   bundle_label = @Translation("Widget type"),
  *   handlers = {
- *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "view_builder" = "Drupal\widget_engine\WidgetEngineViewBuilder",
  *     "list_builder" = "Drupal\widget_engine\WidgetListBuilder",
  *     "views_data" = "Drupal\widget_engine\Entity\WidgetViewsData",
  *
diff --git a/src/WidgetEngineViewBuilder.php b/src/WidgetEngineViewBuilder.php
new file mode 100644
index 0000000..3a16245
--- /dev/null
+++ b/src/WidgetEngineViewBuilder.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\widget_engine;
+
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityViewBuilder;
+
+/**
+ * View builder handler for widgets.
+ */
+class WidgetEngineViewBuilder extends EntityViewBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterBuild(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display, $view_mode) {
+
+    parent::alterBuild($build, $entity, $display, $view_mode);
+    if ($entity->id()) {
+      $build['#contextual_links']['widget'] = [
+        'route_parameters' => ['widget' => $entity->id()],
+      ];
+    }
+  }
+
+}
diff --git a/templates/widget.html.twig b/templates/widget.html.twig
index c2797c1..7fd1ad1 100644
--- a/templates/widget.html.twig
+++ b/templates/widget.html.twig
@@ -17,6 +17,7 @@
 #}
 
 <div{{ attributes.addClass('widget') }}>
+  {{ title_suffix }}
   {% if content %}
     {{- content -}}
   {% endif %}
diff --git a/widget_engine.links.contextual.yml b/widget_engine.links.contextual.yml
new file mode 100644
index 0000000..c1cbf72
--- /dev/null
+++ b/widget_engine.links.contextual.yml
@@ -0,0 +1,10 @@
+entity.widget_engine.edit_form:
+  title: Edit
+  group: widget
+  route_name: entity.widget.edit_form
+  weight: 10
+entity.widget_engine.delete_form:
+  title: Delete
+  group: widget
+  route_name: entity.widget.delete_form
+  weight: 20
