diff --git a/plugins/views/panels.views.inc b/plugins/views/panels.views.inc
index 6f191c7..a04502d 100644
--- a/plugins/views/panels.views.inc
+++ b/plugins/views/panels.views.inc
@@ -17,6 +17,7 @@ function panels_views_plugins() {
         'uses options' => TRUE,
         'type' => 'normal',
         'help topic' => 'style-row-panels-fields',
+        'parent' => 'fields',
       ),
     ),
   );
diff --git a/plugins/views/panels_views_plugin_row_fields.inc b/plugins/views/panels_views_plugin_row_fields.inc
index a502f78..b682971 100644
--- a/plugins/views/panels_views_plugin_row_fields.inc
+++ b/plugins/views/panels_views_plugin_row_fields.inc
@@ -12,13 +12,10 @@
  *
  * @ingroup views_row_plugins
  */
-class panels_views_plugin_row_fields extends views_plugin_row {
+class panels_views_plugin_row_fields extends views_plugin_row_fields {
   function option_definition() {
     $options = parent::option_definition();
 
-    $options['inline'] = array('default' => array());
-    $options['separator'] = array('default' => '');
-    $options['hide_empty'] = array('default' => FALSE);
     $options['layout'] = array('default' => 'twocol');
     $options['regions'] = array('default' => array());
 
@@ -29,34 +26,7 @@ class panels_views_plugin_row_fields extends views_plugin_row {
    * Provide a form for setting options.
    */
   function options_form(&$form, &$form_state) {
-    $fields = $this->display->handler->get_field_labels();
-
-    if (empty($this->options['inline'])) {
-      $this->options['inline'] = array();
-    }
-
-    $form['inline'] = array(
-      '#type' => 'checkboxes',
-      '#title' => t('Inline fields'),
-      '#options' => $fields,
-      '#default_value' => $this->options['inline'],
-      '#description' => t('Inline fields will be displayed next to each other rather than one after another.'),
-    );
-
-    $form['separator'] = array(
-      '#title' => t('Separator'),
-      '#type' => 'textfield',
-      '#size' => 10,
-      '#default_value' => isset($this->options['separator']) ? $this->options['separator'] : '',
-      '#description' => t('The separator may be placed between inline fields to keep them from squishing up next to each other. You can use HTML in this field.'),
-    );
-
-    $form['hide_empty'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Hide empty fields'),
-      '#default_value' => $this->options['hide_empty'],
-      '#description' => t('Do not display fields, labels or markup for fields that are empty.'),
-    );
+    parent::options_form($form, $form_state);
 
     ctools_include('plugins', 'panels');
     $layouts = panels_get_layouts();