diff --git a/include/views/default/crunchbutton/layout/html.bottom.phtml b/include/views/default/crunchbutton/layout/html.bottom.phtml
index 0bd6992eb..eb6077568 100644
--- a/include/views/default/crunchbutton/layout/html.bottom.phtml
+++ b/include/views/default/crunchbutton/layout/html.bottom.phtml
@@ -17,12 +17,6 @@ if ($this->community) {
 
 ?>
 
-<script type="text/javascript">
-	if (top.frames.length != 0 || window != top || top.location != location) {
-		top.location.href = location.href;
-		top.location = self.document.location;
-	}
-</script>
 
 <script type="text/javascript">
 var c = <?=json_encode(c::appConfig())?>;
diff --git a/www/assets/js/app.js b/www/assets/js/app.js
index 0a4189f76..cf43bf845 100644
--- a/www/assets/js/app.js
+++ b/www/assets/js/app.js
@@ -6,6 +6,14 @@
  * @date: 		2012-06-20
  *
  */
+ 
+ 
+if (top.frames.length != 0 || window != top || top.location != location) {
+	top.location.href = location.href;
+	top.location = self.document.location;
+	var REDIRECT = true;
+}
+ 
 var App = {
 	tagline: '',
 	service: '/api/',
@@ -662,7 +670,7 @@ App.processConfig = function(json, user) {
  */
 App.init = function(config) {
 	// ensure this function cant be called twice. can crash the browser if it does.
-	if (App._init) {
+	if (App._init || REDIRECT) {
 		return;
 	}