diff --git a/core/domains/domains.php b/core/domains/domains.php
index 53223e7b98..36419e53aa 100644
--- a/core/domains/domains.php
+++ b/core/domains/domains.php
@@ -198,32 +198,6 @@
 	$document['title'] = $text['title-domains'];
 	require_once "resources/header.php";
 
-//add the list of selected domains to the toggle/delete confirmation
- 	if (permission_exists('domain_edit') || permission_exists('domain_delete')) {
-		?>
-		<script>
-		function get_selected_items(action) {
-			const selected_items = [];
-			const modal_message_element = document.querySelector('#modal-' + action + ' .modal-message');
-
-			if (!modal_message_element.hasAttribute('data-original-message')) {
-				modal_message_element.setAttribute('data-original-message', modal_message_element.innerHTML);
-			}
-			const original_message = modal_message_element.getAttribute('data-original-message');
-
-			document.querySelectorAll('input[type="checkbox"]:checked:not(#checkbox_all)').forEach(checkbox => {
-				selected_items.push(checkbox.dataset.itemName);
-			});
-
-			if (selected_items.length > 0) {
-				const item_list = selected_items.map(item => '<li>' + item + '</li>').join('');
-				modal_message_element.innerHTML = original_message + '<ul style="margin-top: 20px;">' + item_list + '</ul>';
-			}
-		}
-		</script>
-		<?php
-	}
-
 //show the content
 	echo "<div class='action_bar' id='action_bar'>\n";
 	echo "	<div class='heading'><b>".$text['title-domains']."</b><div class='count'>".number_format($num_rows)."</div></div>\n";
@@ -232,10 +206,10 @@
 		echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$settings->get('theme', 'button_icon_add'),'id'=>'btn_add','link'=>'domain_edit.php']);
 	}
 	if (permission_exists('domain_edit') && $domains) {
-		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$settings->get('theme', 'button_icon_toggle'),'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none;','onclick'=>"get_selected_items('toggle'); modal_open('modal-toggle','btn_toggle');"]);
+		echo button::create(['type'=>'button','label'=>$text['button-toggle'],'icon'=>$settings->get('theme', 'button_icon_toggle'),'id'=>'btn_toggle','name'=>'btn_toggle','style'=>'display: none;','onclick'=>"modal_display_selected('modal-toggle'); modal_open('modal-toggle','btn_toggle');"]);
 	}
  	if (permission_exists('domain_delete') && $domains) {
- 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"get_selected_items('delete'); modal_open('modal-delete','btn_delete_domain');"]);
+ 		echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$settings->get('theme', 'button_icon_delete'),'id'=>'btn_delete','name'=>'btn_delete','style'=>'display: none;','onclick'=>"modal_display_selected('modal-delete'); modal_open('modal-delete','btn_delete_domain');"]);
  	}
 	echo 		"<form id='form_search' class='inline' method='get'>\n";
 	echo 		"<input type='text' class='txt list-search' name='search' id='search' value=\"".escape($search)."\" placeholder=\"".$text['label-search']."\" onkeydown=''>";
diff --git a/themes/default/template.php b/themes/default/template.php
index 6056b3c381..fa9a1fd3d0 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -1085,6 +1085,40 @@
 			}
 			document.activeElement.blur();
 		}
+
+		function modal_display_selected(modal_id) {
+			const selected_items = [];
+			const modal_message_element = document.querySelector(`#${modal_id} .modal-message`);
+
+			if (!modal_message_element.hasAttribute('data-message')) {
+				modal_message_element.setAttribute('data-message', modal_message_element.innerHTML);
+				modal_message_element.style.cssText += 'max-height: 50vh; overflow: scroll;';
+			}
+			const message = modal_message_element.getAttribute('data-message');
+
+			document.querySelectorAll('input[type="checkbox"]:checked:not(#checkbox_all)').forEach(checkbox => {
+				selected_items.push({
+					name: checkbox.dataset.itemName,
+					domain: checkbox.dataset.itemDomain
+				});
+			});
+
+			if (selected_items.length > 0) {
+				content = message;
+				content += '<table style="margin: 20px 40px; min-width: 70%;">';
+				content += '	<tbody>';
+				selected_items.forEach(item => {
+					content += '	<tr>';
+					content += `		<td style="display: list-item;">${item.name}</td>`;
+					content += `		<td>${item.domain || ''}</td>`;
+					content += '	</tr>';
+				});
+				content += '	</tbody>';
+				content += '</table>';
+
+				modal_message_element.innerHTML = content;
+			}
+		}
 		{/literal}
 
 	//misc functions