diff --git a/core/lib/Drupal/Core/Controller/DialogController.php b/core/lib/Drupal/Core/Controller/DialogController.php
index c06a225..2852d59 100644
--- a/core/lib/Drupal/Core/Controller/DialogController.php
+++ b/core/lib/Drupal/Core/Controller/DialogController.php
@@ -94,7 +94,7 @@ public function dialog(Request $request, $modal = FALSE) {
     if ($subrequest->isOk()) {
       $content = $subrequest->getContent();
       // @todo Remove use of drupal_get_title() when
-      //   http://drupal.org/node/1871596 is in.
+      //  http://drupal.org/node/1871596 is in.
       $title = drupal_get_title();
       $response = new AjaxResponse();
       // Fetch any modal options passed in from data-dialog-options.
@@ -120,7 +120,7 @@ public function dialog(Request $request, $modal = FALSE) {
         }
         else {
           // Generate a target based on the controller.
-          $target = '#drupal-dialog-' . drupal_html_id(drupal_clean_css_identifier(drupal_strtolower($_content)));
+          $target = drupal_html_id('drupal-dialog');
         }
       }
       $response->addCommand(new OpenDialogCommand($target, $title, $content, $options));