diff --git a/administrator/components/com_modules/tmpl/select/default.php b/administrator/components/com_modules/tmpl/select/default.php
index 7e779d4218d36..8cbc2c02e4767 100644
--- a/administrator/components/com_modules/tmpl/select/default.php
+++ b/administrator/components/com_modules/tmpl/select/default.php
@@ -60,10 +60,12 @@ class="form-control" id="comModulesSelectSearch"
         <div class="main-card card-columns p-4" id="comModulesSelectResultsContainer">
             <?php foreach ($this->items as &$item) : ?>
                 <?php // Prepare variables for the link. ?>
-                    <?php $link = 'index.php?option=com_modules&task=module.add&client_id=' . $this->state->get('client_id', 0) . $this->modalLink . '&eid=' . $item->extension_id; ?>
-                    <?php $name = $this->escape($item->name); ?>
-                    <?php $desc = HTMLHelper::_('string.truncate', $this->escape(strip_tags($item->desc)), 200); ?>
-                <a href="<?php echo Route::_($link); ?>" class="new-module mb-3 comModulesSelectCard" data-function="' . $this->escape($function) : ''; ?>" aria-label="<?php echo Text::sprintf('COM_MODULES_SELECT_MODULE', $name); ?>">
+                <?php $link = 'index.php?option=com_modules&task=module.add&client_id=' . $this->state->get('client_id', 0) . $this->modalLink . '&eid=' . $item->extension_id; ?>
+                <?php $name = $this->escape($item->name); ?>
+                <?php $desc = HTMLHelper::_('string.truncate', $this->escape(strip_tags($item->desc)), 200); ?>
+                <a href="<?php echo Route::_($link); ?>" class="new-module mb-3 comModulesSelectCard"
+                    <?php echo !empty($function) ? 'data-function="' . $this->escape($function) . '"' : ''; ?>
+                    aria-label="<?php echo Text::sprintf('COM_MODULES_SELECT_MODULE', $name); ?>">
                     <div class="new-module-details">
                         <h3 class="new-module-title"><?php echo $name; ?></h3>
                         <p class="card-body new-module-caption p-0">
diff --git a/administrator/components/com_scheduler/src/View/Select/HtmlView.php b/administrator/components/com_scheduler/src/View/Select/HtmlView.php
index 2e9061c0f9cc8..c076824780635 100644
--- a/administrator/components/com_scheduler/src/View/Select/HtmlView.php
+++ b/administrator/components/com_scheduler/src/View/Select/HtmlView.php
@@ -54,14 +54,6 @@ class HtmlView extends BaseHtmlView
      */
     protected $items;
 
-    /**
-     * A suffix for links for modal use [?]
-     *
-     * @var  string
-     * @since  4.1.0
-     */
-    protected $modalLink;
-
     /**
      * HtmlView constructor.
      *
@@ -97,7 +89,6 @@ public function display($tpl = null): void
     {
         $this->state     = $this->get('State');
         $this->items     = $this->get('Items');
-        $this->modalLink = '';
 
         // Check for errors.
         if (\count($errors = $this->get('Errors'))) {
diff --git a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
index 3dceb534eb6ce..024ecff23f542 100644
--- a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
+++ b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
@@ -109,10 +109,7 @@ public function display($tpl = null): void
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        // We don't need toolbar in the modal window.
-        if ($this->getLayout() !== 'modal') {
-            $this->addToolbar();
-        }
+        $this->addToolbar();
 
         parent::display($tpl);
     }
diff --git a/administrator/components/com_scheduler/tmpl/select/default.php b/administrator/components/com_scheduler/tmpl/select/default.php
index e3e1c5ff2c07a..1ab6d113b99bc 100644
--- a/administrator/components/com_scheduler/tmpl/select/default.php
+++ b/administrator/components/com_scheduler/tmpl/select/default.php
@@ -72,7 +72,6 @@ class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
                 <?php $desc = HTMLHelper::_('string.truncate', $this->escape(strip_tags($item->desc)), 200); ?>
                 <!-- The task card begins -->
                 <a href="<?php echo Route::_($link); ?>" class="new-task mb-3 comSchedulerSelectCard"
-                   data-function="' . $this->escape($function) : ''; ?>"
                    aria-label="<?php echo Text::sprintf('COM_SCHEDULER_SELECT_TASK_TYPE', $name); ?>">
                     <div class="new-task-details">
                         <h3 class="new-task-title"><?php echo $name; ?></h3>
diff --git a/administrator/components/com_scheduler/tmpl/select/modal.php b/administrator/components/com_scheduler/tmpl/select/modal.php
deleted file mode 100644
index 5c2d100569e8a..0000000000000
--- a/administrator/components/com_scheduler/tmpl/select/modal.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_scheduler
- *
- * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-/** The SelectView modal layout template. */
-
-// Restrict direct access
-defined('_JEXEC') or die;
-
-use Joomla\Component\Scheduler\Administrator\View\Select\HtmlView;
-
-/** @var  HtmlView  $this */
-
-// Is this needed?
-$this->modalLink = '&tmpl=component&view=select&layout=modal';
-
-// Wrap the default layout in a div.container-popup
-?>
-<div class="container-popup">
-    <?php $this->setLayout('default'); ?>
-
-    <?php try {
-        echo $this->loadTemplate();
-    } catch (Exception $e) {
-        die('Exception while loading template..');
-    }
-    ?>
-</div>