diff --git a/views/bootstrap/class.LogManagement.php b/views/bootstrap/class.LogManagement.php
index 608dde375..a46dd99d8 100644
--- a/views/bootstrap/class.LogManagement.php
+++ b/views/bootstrap/class.LogManagement.php
@@ -65,13 +65,13 @@ class SeedDMS_View_LogManagement extends SeedDMS_Theme_Style {
 				print "<a href=\"../op/op.Download.php?logname=".$entry."\" class=\"btn btn-secondary btn-mini btn-sm\"><i class=\"fa fa-download\"></i><span class=\"d-none d-lg-block\"> ".getMLText("download")."</span></a>";
 			}
 			print "&nbsp;";
-			echo $this->getModalBoxLink(array('target'=>'logViewer', 'remote'=>'out.LogManagement.php?logname='.$entry, 'class'=>'btn btn-primary btn-mini btn-sm', 'title'=>'<i class="fa fa-eye"></i><span class="d-none d-lg-block"> '.getMLText('view').'</span>'));
+			echo $this->getModalBoxLink(array('target'=>'logViewer', 'remote'=>'out.LogManagement.php?logname='.$entry, 'class'=>'btn btn-primary btn-mini btn-sm', 'title'=>'<i class="fa fa-eye"></i><span class="d-none d-lg-block"> '.getMLText('view').'</span>', 'attributes'=>array('data-modal-title'=>$entry)));
 			print "</td>\n";
 			print "</tr>\n";
 		}
 
 		if ($print_header) printMLText("empty_list");
-		else print "<tr><td><span id=\"toggleall\"><i class=\"fa fa-exchange\"></i></span></td><td colspan=\"2\"><button type=\"submit\" class=\"btn btn-danger\"><i class=\"fa fa-remove\"></i> ".getMLText('remove_marked_files')."</button></td></tr></table></form>\n";
+		else print "<tr><td><span id=\"toggleall\"><i class=\"fa fa-exchange\"></i></span></td><td colspan=\"3\"><button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText('remove_marked_files')."</button></td></tr></table></form>\n";
 	} /* }}} */
 
 	function js() { /* {{{ */
diff --git a/views/bootstrap4/styles/application.js b/views/bootstrap4/styles/application.js
index 09b7efa46..0798e8c89 100644
--- a/views/bootstrap4/styles/application.js
+++ b/views/bootstrap4/styles/application.js
@@ -281,6 +281,9 @@ $(document).ready( function() {
 	$('body').on('click', '[data-toggle="modal"]', function(ev){
 		ev.preventDefault();
 		$($(this).data("target")+' .modal-body').load($(this).data("remote"));
+		/* Also set the title */
+		if($(this).data("modal-title"))
+			$($(this).data("target")+' .modal-header h3').html($(this).data("modal-title"));
 	});
 
 //	$('body').on('touchstart.dropdown', '.dropdown-menu', function (e) { e.stopPropagation(); });