diff --git a/lib/WebGUI/Form/Cancel.pm b/lib/WebGUI/Form/Cancel.pm
index 87854d15f..3bf764817 100644
--- a/lib/WebGUI/Form/Cancel.pm
+++ b/lib/WebGUI/Form/Cancel.pm
@@ -47,7 +47,7 @@ sub new {
     my $cancelURL = $session->request->referer;
     my $cancelJS_fragment = $cancelURL ? sprintf("window.location.href='%s'", $cancelURL) : ' history.go(-1)';
     my $cancelJS  = q{
-        if( window.parent && window.parent.admin window.parent.admin.modalDialog ) {
+        if( window.parent && window.parent.admin && window.parent.admin.modalDialog ) {
             window.parent.admin.closeModalDialog();
         } else {
             $cancelJS_fragment;
diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm
index b7f3ffe7b..02e9f636e 100644
--- a/lib/WebGUI/TabForm.pm
+++ b/lib/WebGUI/TabForm.pm
@@ -209,10 +209,7 @@ sub new {
     if (my $cancelURL = $session->request->referer) {
         $cancelJS = sprintf q{window.location.href='%s';}, $cancelURL;
     }
-	my $cancel = WebGUI::Form::button($session,{
-			value=>$i18n->get('cancel'),
-			extras=>sprintf(q|onclick="%s" class="backwardButton"|, $cancelJS),
-			});
+    my $cancel = WebGUI::Form::cancel($session);
 	bless {	_session=>$session, _cancel=>$cancel, _submit=>WebGUI::Form::submit($session), 
         _form=>WebGUI::Form::formHeader($session), _hidden=>"", _tab=>\%tabs, _css=>$css }, $class;
 }