diff --git a/plugins/cck_field/button_free/button_free.php b/plugins/cck_field/button_free/button_free.php
index 5c3932f6e..dc5c6a2d8 100644
--- a/plugins/cck_field/button_free/button_free.php
+++ b/plugins/cck_field/button_free/button_free.php
@@ -227,8 +227,10 @@ public function onCCK_FieldPrepareForm( &$field, $value = '', &$config = array()
 				} elseif ( $field1->link ) {
 					if ( isset( $field1->link_target ) && $field1->link_target == '_blank' ) {
 						$onclick	=	'var otherWindow = window.open(); otherWindow.opener = null; otherWindow.location = \''.$field1->link.'\';';					
-					} else {
+					} elseif ( strpos( $field1->link, 'javascript:' ) === false ) {
 						$onclick	=	'document.location.href=\''.$field1->link.'\'';
+					} else {
+						$onclick	=	$field1->link;
 					}
 				} else {
 					$canDo		=	false;