diff --git a/roundup/cgi/templating.py b/roundup/cgi/templating.py
index 574c0fee..3faa7529 100644
--- a/roundup/cgi/templating.py
+++ b/roundup/cgi/templating.py
@@ -3442,15 +3442,32 @@ def base_javascript(self):
         return """
 <script nonce="%s" type="text/javascript">
 submitted = false;
-function submit_once() {
+submitted_restore = "";
+
+function submit_reset() {
+    $("#submit_overlay").hide();
+    if (typeof(submitted)!=typeof(true)) {
+        submitted.value = submitted.textContent = submitted_restore;
+        submitted.disabled = false;
+    }
+    submitted = false;
+}
+
+function submit_once(e) {
     if (submitted) {
         alert("Your request is being processed.\\nPlease be patient.");
         return false;
     }
 
-    window.setTimeout("submitted = false;", 5000)
+    window.setTimeout(submit_reset, 5000);
 
-    submitted = true;
+    if (e) {
+        submitted = e;
+        submitted_restore = e.value ? e.value : e.textContent;
+        e.value = e.textContent = "Submitting...";
+        e.disabled = true;
+    } else submitted = true;
+    $("#submit_overlay").show();
     return true;
 }
 
@@ -3782,7 +3799,7 @@ def embed_form_fields(self, excluded_fields=None):
 
     const transfer = new DataTransfer();
     file_list = document.querySelectorAll('pre[data-mimetype]');
-    file_list.forEach( file => 
+    file_list.forEach( file =>
         transfer.items.add(
            new File([window.atob(file.textContent)],
            file.dataset.filename,
diff --git a/share/roundup/templates/classic/html/page.html b/share/roundup/templates/classic/html/page.html
index 54f63ee0..d46bf50c 100644
--- a/share/roundup/templates/classic/html/page.html
+++ b/share/roundup/templates/classic/html/page.html
@@ -23,6 +23,9 @@
 	     columns_showall string:id,activity,title,creator,assignedto,status;
 	     status_notresolved string:-1,1,2,3,4,5,6,7;
 	     ">
+	<div id="submit_overlay">
+	    <div id="status_overlay_content">&#9203; Please wait...</div>
+	</div>
     <header>
 	<div class="header-left">
 	    <div id="header-logo">
diff --git a/share/roundup/templates/classic/html/style.css b/share/roundup/templates/classic/html/style.css
index c1b04822..c6183cfd 100644
--- a/share/roundup/templates/classic/html/style.css
+++ b/share/roundup/templates/classic/html/style.css
@@ -174,7 +174,7 @@ td.content {
   width: 100%;
 }
 
-td.date, th.date { 
+td.date, th.date {
   white-space: nowrap;
 }
 
@@ -412,7 +412,7 @@ table.classlist th {
 
 
 /* style for class help display */
-table.classhelp {      /* the table-layout: fixed;        */ 
+table.classhelp {      /* the table-layout: fixed;        */
   table-layout: fixed; /* compromises quality for speed   */
   overflow: hidden;
   font-size: .9em;
@@ -514,5 +514,22 @@ textarea:focus, select:focus {
   background-color: #afafaf;
 }
 
+.submit_overlay {
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  place-content: center;
+  background-color: rgba(0,0,0,0.5);
+  z-index: 9999;
+  font-size: 200%;
+  font-weight: bold;
+  color: white;
+  text-shadow: 2px 2px 2px black;
+}
+
 /* vim: sts=2 sw=2 et
 */
diff --git a/share/roundup/templates/devel/html/page.html b/share/roundup/templates/devel/html/page.html
index 3f00e6c7..ac2981d6 100644
--- a/share/roundup/templates/devel/html/page.html
+++ b/share/roundup/templates/devel/html/page.html
@@ -22,6 +22,9 @@
                    milestone_columns string:id,activity,title,creator,status;
                    milestone_columns_showall string:id,activity,title,creator,assignee,status;
                    milestone_status_notclosed string:-1,1,2,4;">
+  <div id="submit_overlay">
+   <div id="status_overlay_content">&#9203; Please wait...</div>
+  </div>
   <div class="header">
    <h1><a href="/">Roundup Demo Tracker</a></h1>
    <div id="searchbox">
@@ -211,7 +214,7 @@ <h1><a href="/">Roundup Demo Tracker</a></h1>
         <a tal:attributes="href string:user${request/user/id}" i18n:translate="">Your Details</a>
        </li>
        <li>
-        <a tal:attributes="href python:request.indexargs_url('', {'@action':'logout'})" 
+        <a tal:attributes="href python:request.indexargs_url('', {'@action':'logout'})"
            i18n:translate="">Logout</a>
        </li>
        <li class="" tal:condition="python:request.user.hasPermission('View', 'query')">
diff --git a/share/roundup/templates/jinja2/html/layout/page.html b/share/roundup/templates/jinja2/html/layout/page.html
index a395f48a..182a961e 100644
--- a/share/roundup/templates/jinja2/html/layout/page.html
+++ b/share/roundup/templates/jinja2/html/layout/page.html
@@ -13,6 +13,9 @@
     {%- block extracss %} {% endblock %}
   </head>
   <body>
+    <div id="submit_overlay">
+      <div id="status_overlay_content">&#9203; Please wait...</div>
+    </div>
     {% block navbar %}
       {% include 'layout/banner.html' %}
     {% endblock %}
diff --git a/share/roundup/templates/jinja2/static/style.css b/share/roundup/templates/jinja2/static/style.css
index f40406ae..547d4a8d 100644
--- a/share/roundup/templates/jinja2/static/style.css
+++ b/share/roundup/templates/jinja2/static/style.css
@@ -92,3 +92,20 @@ select:required {
   border-width: 1.5px;
   border-color: #6e747a;
 }
+
+.submit_overlay {
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  place-content: center;
+  background-color: rgba(0,0,0,0.5);
+  z-index: 9999;
+  font-size: 200%;
+  font-weight: bold;
+  color: white;
+  text-shadow: 2px 2px 2px black;
+}
diff --git a/share/roundup/templates/minimal/html/page.html b/share/roundup/templates/minimal/html/page.html
index ffb1264b..158b07f2 100644
--- a/share/roundup/templates/minimal/html/page.html
+++ b/share/roundup/templates/minimal/html/page.html
@@ -13,7 +13,7 @@
 
 </head>
 <body class="body">
-
+<span id="submit_overlay"></span>
 <table class="body"
  tal:define="
 kw_edit python:request.user.hasPermission('Edit', 'keyword');
diff --git a/share/roundup/templates/minimal/html/style.css b/share/roundup/templates/minimal/html/style.css
index c3e2f9d6..6a1e1729 100644
--- a/share/roundup/templates/minimal/html/style.css
+++ b/share/roundup/templates/minimal/html/style.css
@@ -98,7 +98,7 @@ td.content {
   width: 100%;
 }
 
-td.date, th.date { 
+td.date, th.date {
   white-space: nowrap;
 }
 
@@ -336,7 +336,7 @@ table.classlist th {
 
 
 /* style for class help display */
-table.classhelp {      /* the table-layout: fixed;        */ 
+table.classhelp {      /* the table-layout: fixed;        */
   table-layout: fixed; /* compromises quality for speed   */
   overflow: hidden;
   font-size: .9em;
@@ -438,5 +438,9 @@ textarea:focus, select:focus {
   background-color: #afafaf;
 }
 
+.submit_overlay {
+  display: none;
+}
+
 /* vim: sts=2 sw=2 et
 */
diff --git a/share/roundup/templates/responsive/html/page.html b/share/roundup/templates/responsive/html/page.html
index ec60063f..a6f2d693 100644
--- a/share/roundup/templates/responsive/html/page.html
+++ b/share/roundup/templates/responsive/html/page.html
@@ -28,6 +28,9 @@
                    milestone_columns string:id,activity,title,creator,status;
                    milestone_columns_showall string:id,activity,title,creator,assignee,status;
                    milestone_status_notclosed string:-1,1,2,4;">
+  <div id="submit_overlay">
+   <div id="status_overlay_content">&#9203; Please wait...</div>
+  </div>
   <div class="navbar navbar-fixed-top">
     <div class='navbar-inner'>
       <div class='container'>
@@ -224,7 +227,7 @@
               <a tal:attributes="href string:user${request/user/id}" i18n:translate="">Your Details</a>
             </li>
             <li>
-              <a tal:attributes="href python:request.indexargs_url('', {'@action':'logout'})" 
+              <a tal:attributes="href python:request.indexargs_url('', {'@action':'logout'})"
                  i18n:translate="">Logout</a>
            </li>
            <li class="" tal:condition="python:request.user.hasPermission('View', 'query')">
diff --git a/website/issues/html/page.html b/website/issues/html/page.html
index c5a9403b..f2f25b6e 100644
--- a/website/issues/html/page.html
+++ b/website/issues/html/page.html
@@ -24,6 +24,9 @@
 columns_showall string:id,activity,title,creator,assignee,status;
 status_notresolved string:-1,1,2,4;
 ">
+  <div id="submit_overlay">
+   <div id="status_overlay_content">&#9203; Please wait...</div>
+  </div>
   <div class="header">
     <h1><a href="/">Roundup Tracker - Issues</a></h1>
 <div id="searchbox">