diff --git a/index.php b/index.php
index 7d485ca38..80b9d91c6 100644
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?php
+<?php 
     /**
      * @file  index.php
      * @author zero <zero@zeroboard.com>
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index 0c41ada41..d330ca6c0 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -79,8 +79,9 @@ function getWidgetContent(obj) {
     var html = "";
     if(typeof(obj)=='undefined' || !obj) obj = zonePageObj;
 
-    var widget;
+    var widget = null;
     jQuery(obj).find('div[widget]').each(function(){
+	if(jQuery(this).parent().get(0) != obj) return;
         widget = jQuery(this).attr('widget');
             switch(widget) {
                 case 'widgetBox' :