diff --git a/files/assets/js/general39.js b/files/assets/js/general39.js
index 68263b1b6..b9fb6ab0f 100644
--- a/files/assets/js/general39.js
+++ b/files/assets/js/general39.js
@@ -122,8 +122,9 @@ function post_toast2(url, button1, button2) {
 	document.getElementById(button2).classList.toggle("d-none");
 }
 
-// // Tooltips
-
-// $(document).ready(function(){
-// 	$('[data-bs-toggle="tooltip"]').tooltip(); 
-// });
\ No newline at end of file
+document.addEventListener("DOMContentLoaded", function(){
+    var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'));
+    var tooltipList = tooltipTriggerList.map(function(element){
+        return new bootstrap.Tooltip(element);
+    });
+});
\ No newline at end of file
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 590b7ed8e..a28d6478e 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -10,14 +10,14 @@
 
 		<script>
 		
-			document.ready(function() {
+			document.addEventListener("DOMContentLoaded", function(){
 				document.getElementById('submitform').submit(function() {
-						// disable button
-						document.getElementById('create_button').prop("disabled", true);
-						// add spinner to button
-						document.getElementById('create_button').html('<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Creating post');
-					});
+					// disable button
+					document.getElementById('create_button').prop("disabled", true);
+					// add spinner to button
+					document.getElementById('create_button').html('<span class="spinner-border spinner-border-sm mr-2" role="status" aria-hidden="true"></span>Creating post');
 				});
+			});
 
 			// Text Formatting