diff --git a/lib/class-wp-widget-block.php b/lib/class-wp-widget-block.php
index 97b44eaa287e5..b5fbe90c2162e 100644
--- a/lib/class-wp-widget-block.php
+++ b/lib/class-wp-widget-block.php
@@ -175,20 +175,8 @@ public function update( $new_instance, $old_instance ) {
 	 */
 	public function form( $instance ) {
 		$instance = wp_parse_args( (array) $instance, $this->default_instance );
-		echo do_blocks( $instance['content'] );
-		$textarea_id = $this->get_field_id( 'content' );
 		?>
-		<br/>
-		<textarea id="<?php echo $textarea_id; ?>" name="<?php echo $this->get_field_name( 'content' ); ?>"
-				class="content sync-input" hidden><?php echo esc_textarea( $instance['content'] ); ?></textarea>
-		<script>
-			(function() {
-				var link = "<?php echo esc_js( admin_url( 'themes.php?page=gutenberg-widgets' ) ); ?>";
-				var container = jQuery('#<?php echo $textarea_id; ?>').closest(".form").find('.widget-control-actions .alignleft');
-				container.prepend(jQuery('<span> |</span>'));
-				container.prepend(jQuery('<a href="'+link+'" class="button-link">Edit</a>'));
-			})();
-		</script>
+		<textarea id="<?php echo $this->get_field_id( 'content' ); ?>" name="<?php echo $this->get_field_name( 'content' ); ?>" rows="6" cols="50" class="widefat text wp-block-widget-textarea"><?php echo esc_textarea( $instance['content'] ); ?></textarea>
 		<?php
 	}
 
diff --git a/lib/widgets-page.php b/lib/widgets-page.php
index 931013502c7ff..6815bf5b75b7a 100644
--- a/lib/widgets-page.php
+++ b/lib/widgets-page.php
@@ -33,7 +33,7 @@ function gutenberg_widgets_init( $hook ) {
 		wp_enqueue_style( 'wp-block-library-theme' );
 		wp_add_inline_style(
 			'wp-block-library-theme',
-			'.block-widget-form .widget-control-save { display: none; }'
+			'.wp-block-widget-textarea { width: 100%; min-height: 5em; margin: 8px 0 16px 0; }'
 		);
 		return;
 	}