diff --git a/src/templates/main.tpl.html b/src/templates/main.tpl.html
index 4ae1e770..dada729a 100755
--- a/src/templates/main.tpl.html
+++ b/src/templates/main.tpl.html
@@ -19,12 +19,6 @@
     <script type="text/javascript" src="static/plugin/jquery-1.7.1.min.js"></script>
     <script type="text/javascript" src="static/plugin/twitter-bootstrap/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="static/js/scripts.js"></script>
-    <script type="text/javascript">
-        $(document).bind('ready', function(){
-			psm_flash_message();
-			psm_tooltips();
-        });
-    </script>
   </head>
   <body data-spy="scroll" data-target=".subnav" data-offset="50">
     <!-- navbar -->
diff --git a/static/js/scripts.js b/static/js/scripts.js
index 22187433..ff690cb8 100755
--- a/static/js/scripts.js
+++ b/static/js/scripts.js
@@ -19,7 +19,7 @@ $().ready(function() {
 				}
 			}
 			$modal.modal('show');
-		} else {	
+		} else {
 			// Just in case we forgot the dialog box
 			var conf = confirm("Are you sure?");
 			if (conf === true) {
@@ -28,6 +28,9 @@ $().ready(function() {
 		}
 		return false;
 	});
+
+	psm_flash_message();
+	psm_tooltips();
 });
 
 function psm_tooltips() {
