diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index 70c333f11..4f7ef704f 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -47,11 +47,12 @@
                 $output = $oWidget->proc($args);
             }
 
-            if($args->widget_fix_width == 'Y') {
-                $style = "";
+            $style = "";
+            $style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left);
 
+            if($args->widget_fix_width == 'Y') {
                 $style .= sprintf("%s:%spx;", "width", trim($args->widget_width));
-                $style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $args->widget_margin_top, $args->widget_margin_right,$args->widget_margin_bottom,$args->widget_margin_left);
+
                 if($args->widget_position) {
                     $style .= sprintf("%s:%s;", "float", trim($args->widget_position));
                     $output = sprintf('<div style="%s">%s</div>',$style, $output);
@@ -59,6 +60,8 @@
                     $style  .= "float:left;";
                     $output = sprintf('<div class="clear"></div><div style="%s">%s</div>',$style, $output);
                 }
+            } else {
+                $output = sprintf('<div style="%s">%s</div>',$style, $output);
             }
 
             if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
diff --git a/modules/widget/tpl/js/widget_admin.js b/modules/widget/tpl/js/widget_admin.js
index d0656fe30..8c24a15fd 100644
--- a/modules/widget/tpl/js/widget_admin.js
+++ b/modules/widget/tpl/js/widget_admin.js
@@ -133,10 +133,13 @@ function doFillWidgetVars() {
 
     }
 
-    var marginLeft = parseInt(selected_node.style.marginLeft.replace(/px$/,''),10);
-    var marginRight = parseInt(selected_node.style.marginRight.replace(/px$/,''),10);
-    var border = parseInt(selected_node.style.border);
-
+    var marginLeft = 0;
+    if(selected_node.style.marginLeft) marginLeft = parseInt(selected_node.style.marginLeft.replace(/px$/,''),10);
+    var marginRight = 0;
+    if(selected_node.style.marginRight) marginRight = parseInt(selected_node.style.marginRight.replace(/px$/,''),10);
+    var border = 0;
+    if(selected_node.style.border) border= parseInt(selected_node.style.boarder.replace(/px$/,''),10);
+    
     fo_obj.widget_width.value = xWidth(selected_node) + marginLeft + marginRight - 6;
 
     //  컬러셋 설정
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html
index e64cbe85c..6f408b11c 100644
--- a/modules/widget/tpl/widget_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_generate_code_in_page.html
@@ -78,6 +78,22 @@
             </td>
         </tr>
         <!--@end-->
+        <tr>
+            <th scope="row">{$lang->widget_margin}</th>
+            <td>
+                {$lang->widget_margin_top} <input type="text" name="widget_margin_top" value="0" size="2" class="inputTypeText" />px
+                {$lang->widget_margin_right} <input type="text" name="widget_margin_right" value="0" size="2" class="inputTypeText" />px
+                {$lang->widget_margin_bottom} <input type="text" name="widget_margin_bottom" value="0" size="2" class="inputTypeText" />px
+                {$lang->widget_margin_left} <input type="text" name="widget_margin_left" value="0" size="2" class="inputTypeText"/>px
+                <br />
+                {$lang->about_widget_margin}
+            </td>
+        </tr>
+        </table>
+
+        <table cellspacing="0" class="tableType5 gap1">
+        <col width="100" />
+        <col />
         <tr>
             <th scope="row">{$lang->widget_fix_width}</th>
             <td>
@@ -102,17 +118,6 @@
                 <p>{$lang->about_widget_position}</p>
             </td>
         </tr>
-        <tr>
-            <th scope="row">{$lang->widget_margin}</th>
-            <td>
-                {$lang->widget_margin_top} <input type="text" name="widget_margin_top" value="0" size="2" class="inputTypeText" />px
-                {$lang->widget_margin_right} <input type="text" name="widget_margin_right" value="0" size="2" class="inputTypeText" />px
-                {$lang->widget_margin_bottom} <input type="text" name="widget_margin_bottom" value="0" size="2" class="inputTypeText" />px
-                {$lang->widget_margin_left} <input type="text" name="widget_margin_left" value="0" size="2" class="inputTypeText"/>px
-                <br />
-                {$lang->about_widget_margin}
-            </td>
-        </tr>
         </table>
     </div>
     <div id="popFooter" class="tCenter gap1">
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 2bdbfecf9..192bc951a 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -39,17 +39,17 @@
             }
 
 
-            if($vars->widget_fix_width == 'Y') {
-                $style = "";
+            $style = "";
+            $style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $vars->widget_margin_top, $vars->widget_margin_right,$vars->widget_margin_bottom,$vars->widget_margin_left);
 
+            if($vars->widget_fix_width == 'Y') {
                 $vars->widget_width = $vars->widget_width - $vars->widget_margin_left - $vars->widget_margin_right;
                 $style .= sprintf("%s:%spx;", "width", trim($vars->widget_width));
-                $style .= sprintf("margin:%dpx %dpx %dpx %dpx;", $vars->widget_margin_top, $vars->widget_margin_right,$vars->widget_margin_bottom,$vars->widget_margin_left);
                 if($vars->widget_position) $style .= sprintf("%s:%s;", "float", trim($vars->widget_position));
                 else $style .= "float:left;";
                 $widget_code = sprintf('<img src="%s" class="zbxe_widget_output" widget="%s" %s style="%s" />', $blank_img_path, $widget, implode(' ',$attribute), $style);
             } else {
-                $widget_code = sprintf('<img width="100" height="100" src="%s" class="zbxe_widget_output" widget="%s" %s />', $blank_img_path, $widget, implode(' ',$attribute));
+                $widget_code = sprintf('<img width="100" height="100" src="%s" class="zbxe_widget_output" style="%s" widget="%s" %s />', $blank_img_path, $style, $widget, implode(' ',$attribute));
             }
 
             $cache_path = './files/cache/widget_cache/';