diff --git a/templates/base.html b/templates/base.html
index 105a236..a13baa6 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -36,6 +36,10 @@
     <link rel="icon" href="{{ FAVICON }}" type="image/x-icon">
   {% endif %}
 
+  {% if GOOGLE_ANALYTICS %}
+    {% include "partial/ga.html" %}
+  {% endif %}
+
   <meta charset="utf-8" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="HandheldFriendly" content="True" />
@@ -75,10 +79,13 @@
     });
   </script>
   {% endif %}
+  {% if GOOGLE_TAG_MANAGER %}
+    {% include "partial/gtm.html" %}
+  {% endif %}
 </head>
 <body>
   {% if GOOGLE_TAG_MANAGER %}
-    {% include "partial/gtm.html" %}
+    {% include "partial/gtm_noscript.html" %}
   {% endif %}
   <aside>
     <div>
@@ -169,10 +176,6 @@
     </footer>
   </main>
 
-  {% if GOOGLE_ANALYTICS %}
-    {% include "partial/ga.html" %}
-  {% endif %}
-
   {% if GUAGES %}
     {% include "partial/guages.html" %}
   {% endif %}
diff --git a/templates/partial/gtm.html b/templates/partial/gtm.html
index 69d266d..d86382d 100644
--- a/templates/partial/gtm.html
+++ b/templates/partial/gtm.html
@@ -1,7 +1,4 @@
 <!-- Google Tag Manager -->
-<noscript>
-  <iframe src="//www.googletagmanager.com/ns.html?id={{ GOOGLE_TAG_MANAGER }}" height="0" width="0" style="display:none;visibility:hidden"></iframe>
-</noscript>
 <script>
   (function(w,d,s,l,i){
     w[l]=w[l]||[];
diff --git a/templates/partial/gtm_noscript.html b/templates/partial/gtm_noscript.html
new file mode 100644
index 0000000..3d86385
--- /dev/null
+++ b/templates/partial/gtm_noscript.html
@@ -0,0 +1,5 @@
+<!-- Google Tag Manager -->
+<noscript>
+  <iframe src="//www.googletagmanager.com/ns.html?id={{ GOOGLE_TAG_MANAGER }}" height="0" width="0" style="display:none;visibility:hidden"></iframe>
+</noscript>
+<!-- End Google Tag Manager -->
