diff --git a/paramecio2/libraries/mtemplates.py b/paramecio2/libraries/mtemplates.py
index 374c573..bf6b9b9 100644
--- a/paramecio2/libraries/mtemplates.py
+++ b/paramecio2/libraries/mtemplates.py
@@ -67,8 +67,8 @@ class PTemplate:
         self.add_filter(self.load_js)
 
     def add_js(self, js, module=''):
-        
-        self.js[js]='<script language="Javascript" src="{}"></script>'.format(make_media_url('js/'+js, module))
+        if not js in self.js:
+            self.js[js]='<script language="Javascript" src="{}"></script>'.format(make_media_url('js/'+js, module))
         
     def load_js(self):
         
diff --git a/paramecio2/modules/admin/templates/dashboard.phtml b/paramecio2/modules/admin/templates/dashboard.phtml
index 46c3005..ec44951 100644
--- a/paramecio2/modules/admin/templates/dashboard.phtml
+++ b/paramecio2/modules/admin/templates/dashboard.phtml
@@ -14,7 +14,6 @@
 <script language="Javascript" src="${make_media_url('js/jquery.min.js', 'admin')}"></script>
 <script language="Javascript" src="${make_media_url('js/responsive-nav.min.js', 'admin')}"></script>
 <script language="Javascript" src="${make_media_url('js/tooltipster.bundle.min.js', 'admin')}"></script>
-${load_js()|n}
 <%block name="extra_js">
 </%block>
 <%block name="extra_header">
@@ -106,6 +105,7 @@ ${load_js()|n}
     });
     
 </script>
+${load_js()|n}
 <%block name="jscript_block">
 </%block>
 </body>