diff --git a/core/modules/views_ui/src/ViewAddForm.php b/core/modules/views_ui/src/ViewAddForm.php
index 1210b4f6f63d092e93e68205dbed69c2c78ceef7..2d9cdf34ce14ad43c7a4426e0ee3ef6f97639625 100644
--- a/core/modules/views_ui/src/ViewAddForm.php
+++ b/core/modules/views_ui/src/ViewAddForm.php
@@ -7,6 +7,7 @@
 use Drupal\views\Plugin\views\wizard\WizardException;
 use Drupal\views\Plugin\ViewsPluginManager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
 
 /**
  * Form controller for the Views add form.
@@ -22,14 +23,24 @@ class ViewAddForm extends ViewFormBase {
    */
   protected $wizardManager;
 
+  /**
+   * The module handler service.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
   /**
    * Constructs a new ViewAddForm object.
    *
    * @param \Drupal\views\Plugin\ViewsPluginManager $wizard_manager
    *   The wizard plugin manager.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
    */
-  public function __construct(ViewsPluginManager $wizard_manager) {
+  public function __construct(ViewsPluginManager $wizard_manager, ModuleHandlerInterface $module_handler) {
     $this->wizardManager = $wizard_manager;
+    $this->moduleHandler = $module_handler;
   }
 
   /**
@@ -37,7 +48,8 @@ public function __construct(ViewsPluginManager $wizard_manager) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('plugin.manager.views.wizard')
+      $container->get('plugin.manager.views.wizard'),
+      $container->get('module_handler')
     );
   }
 
@@ -126,7 +138,7 @@ public function form(array $form, FormStateInterface $form_state) {
       '#sort_options' => TRUE,
     ];
     $show_form = &$form['displays']['show'];
-    $default_value = \Drupal::moduleHandler()->moduleExists('node') ? 'node' : 'users';
+    $default_value = $this->moduleHandler->moduleExists('node') ? 'node' : 'users';
     $show_form['wizard_key']['#default_value'] = WizardPluginBase::getSelected($form_state, ['show', 'wizard_key'], $default_value, $show_form['wizard_key']);
     // Changing this dropdown updates the entire content of $form['displays'] via
     // AJAX.
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index c0e0c353c3397a23bfc52942d9b06935e0dad9dd..c384ee2c6180f22165ea07e0c0642e093689f529 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -18,6 +18,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
+use Drupal\Core\Extension\ModuleHandlerInterface;
 
 /**
  * Form controller for the Views edit form.
@@ -61,6 +62,13 @@ class ViewEditForm extends ViewFormBase {
    */
   protected $themeManager;
 
+  /**
+   * The module handler service.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
   /**
    * Constructs a new ViewEditForm object.
    *
@@ -74,13 +82,16 @@ class ViewEditForm extends ViewFormBase {
    *   The element info manager.
    * @param \Drupal\Core\Theme\ThemeManagerInterface $theme_manager
    *   The theme manager.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
    */
-  public function __construct(SharedTempStoreFactory $temp_store_factory, RequestStack $requestStack, DateFormatterInterface $date_formatter, ElementInfoManagerInterface $element_info, ThemeManagerInterface $theme_manager) {
+  public function __construct(SharedTempStoreFactory $temp_store_factory, RequestStack $requestStack, DateFormatterInterface $date_formatter, ElementInfoManagerInterface $element_info, ThemeManagerInterface $theme_manager, ModuleHandlerInterface $module_handler) {
     $this->tempStore = $temp_store_factory->get('views');
     $this->requestStack = $requestStack;
     $this->dateFormatter = $date_formatter;
     $this->elementInfo = $element_info;
     $this->themeManager = $theme_manager;
+    $this->moduleHandler = $module_handler;
   }
 
   /**
@@ -92,7 +103,8 @@ public static function create(ContainerInterface $container) {
       $container->get('request_stack'),
       $container->get('date.formatter'),
       $container->get('element_info'),
-      $container->get('theme.manager')
+      $container->get('theme.manager'),
+      $container->get('module_handler')
     );
   }
 
@@ -374,7 +386,7 @@ public function getDisplayTab($view) {
     // context, so hook_form_view_edit_form_alter() is insufficient.
     // @todo remove this after
     //   https://www.drupal.org/project/drupal/issues/3087455 has been resolved.
-    \Drupal::moduleHandler()->alter('views_ui_display_tab', $build, $view, $display_id);
+    $this->moduleHandler->alter('views_ui_display_tab', $build, $view, $display_id);
     // Because themes can implement hook_form_FORM_ID_alter() and because this
     // is a workaround for hook_form_view_edit_form_alter() being insufficient,
     // also invoke this on themes.
@@ -754,7 +766,7 @@ public function renderDisplayTop(ViewUI $view) {
     }
 
     // Let other modules add additional links here.
-    \Drupal::moduleHandler()->alter('views_ui_display_top_links', $element['extra_actions']['#links'], $view, $display_id);
+    $this->moduleHandler->alter('views_ui_display_top_links', $element['extra_actions']['#links'], $view, $display_id);
 
     if (isset($view->type) && $view->type != $this->t('Default')) {
       if ($view->type == $this->t('Overridden')) {
@@ -804,7 +816,7 @@ public function renderDisplayTop(ViewUI $view) {
     // context, so hook_form_view_edit_form_alter() is insufficient.
     // @todo remove this after
     //   https://www.drupal.org/project/drupal/issues/3087455 has been resolved.
-    \Drupal::moduleHandler()->alter('views_ui_display_top', $element, $view, $display_id);
+    $this->moduleHandler->alter('views_ui_display_top', $element, $view, $display_id);
     // Because themes can implement hook_form_FORM_ID_alter() and because this
     // is a workaround for hook_form_view_edit_form_alter() being insufficient,
     // also invoke this on themes.