diff --git a/admin/panels/widgets/admin.widgets.default.php b/admin/panels/widgets/admin.widgets.default.php
index 6e2579d..dd0a342 100644
--- a/admin/panels/widgets/admin.widgets.default.php
+++ b/admin/panels/widgets/admin.widgets.default.php
@@ -111,9 +111,9 @@
 
 			$this->smarty->assign('success', ( $success )? 1 : -1 );
 			
-			return 1;
+			return PANEL_REDIRECT_CURRENT;
 			
 		}
 	
 	}
-?>
\ No newline at end of file
+?>
diff --git a/admin/panels/widgets/admin.widgets.raw.php b/admin/panels/widgets/admin.widgets.raw.php
index 541604c..fef2d47 100755
--- a/admin/panels/widgets/admin.widgets.raw.php
+++ b/admin/panels/widgets/admin.widgets.raw.php
@@ -13,7 +13,7 @@
  *
  */
  
- 	class admin_widgets_raw extends AdminPanelActionValidated {
+ 	class admin_widgets_raw extends AdminPanelAction {
 	 
 		var $validators =  array(array('content', 'content', 'notEmpty', false, false));
 		var $events = array('save');
@@ -51,7 +51,7 @@
 			$this->smarty->assign('success', ( $success )? 1 : -1 );
 			$this->smarty->assign('pluginconf', $str);
 			
-			return $success;
+			return PANEL_REDIRECT_CURRENT;
 			
 		}
 	
diff --git a/admin/panels/widgets/admin.widgets.raw.tpl b/admin/panels/widgets/admin.widgets.raw.tpl
index c4c1696..0f645ec 100755
--- a/admin/panels/widgets/admin.widgets.raw.tpl
+++ b/admin/panels/widgets/admin.widgets.raw.tpl
@@ -6,11 +6,7 @@
 
 {include file='shared:errorlist.tpl'}
 
-<form method="post"
-	action="{$smarty.const.BLOG_BASEURL}admin.php?{$smarty.server.QUERY_STRING|escape:"html"}"
-	enctype="multipart/form-data">
-	
-	
+{html_form}	
 		
 		<p>
 		<textarea name="content" id="content"
@@ -22,4 +18,4 @@
 	{html_submit name="save" id="save" value=$panelstrings.submit}
 	</div>
 
-</form>
+{/html_form}