diff --git includes/admin.inc includes/admin.inc
index 5155177..e6be438 100644
--- includes/admin.inc
+++ includes/admin.inc
@@ -1116,6 +1116,8 @@ function template_preprocess_views_ui_edit_tab(&$vars) {
   $tag = empty($view->tag) ? t('None') : $view->tag;
   $vars['details'] = t('Tag') . ': ' . l($tag, "admin/build/views/nojs/details/$view->name", array('attributes' => array('class' => 'views-ajax-link')));
 
+  $vars['query_builder'] = t('Query Builder') .': '. l(t('Settings'), "admin/build/views/nojs/query-builder/$view->name", array('attributes' => array('class' => 'views-ajax-link')));
+
   // Calculate options from display plugin.
   $options = $categories = array();
   $display->handler->options_summary($categories, $options);
@@ -1459,6 +1461,10 @@ function views_ui_ajax_forms($key = NULL) {
       'form_id' => 'views_ui_edit_display_form',
       'args' => array('section'),
     ),
+    'query-builder' => array(
+      'form_id' => 'views_ui_edit_query_builder_form',
+      'args' => array('section'),
+    ),
     'remove-display' => array(
       'form_id' => 'views_ui_remove_display_form',
       'args' => array(),
@@ -2125,6 +2131,69 @@ function views_ui_edit_details_form_submit($form, &$form_state) {
   $form_state['redirect'] = 'admin/build/views/edit/' . $form_state['view']->name;
 }
 
+
+/**
+ * Page callback to edit details of a view.
+ */
+function views_ui_edit_query_builder($js, $view) {
+  views_include('ajax');
+  $form_state = array(
+    'view' => &$view,
+    'ajax' => $js,
+  );
+
+  $output = views_ajax_form_wrapper('views_ui_edit_query_builder_form', $form_state);
+
+  if ($js) {
+    // If we don't have an output object, it was submitted. Set up the submission.
+    if (empty($output)) {
+      return views_ui_regenerate_tabs($view);
+    }
+    return views_ajax_render($output);
+
+  }
+  return $output;
+}
+
+/**
+ * Form constructor callback to edit details of a view
+ */
+function views_ui_edit_query_builder_form(&$form_state) {
+  $view = &$form_state['view'];
+
+  $form['#title'] = t('View Query Builder settings');
+  $form['#section'] = 'details';
+
+  $views_data = views_fetch_data($view->base_table);
+  // Create and initialize the query object.
+  $plugin = !empty($views_data['table']['base']['query class']) ? $views_data['table']['base']['query class'] : 'views_query';
+  $view->query = views_get_plugin('query', $plugin);
+
+  $view->query->init($view->base_table, $view->base_field);
+
+  $view->query->options_form($form, $form_state);
+
+  views_ui_standard_form_buttons($form, $form_state, 'views_ui_edit_query_builder_form');
+  return $form;
+}
+
+/**
+ * Validation handler for views_ui_edit_query_builder_form
+ */
+function views_ui_edit_query_builder_form_validate($form, &$form_state) {
+  $form_state['view']->query->options_validate(&$form, &$form_state);
+}
+
+
+/**
+ * Submit handler for views_ui_edit_query_builder_form
+ */
+function views_ui_edit_query_builder_form_submit($form, &$form_state) {
+  $form_state['view']->query->options_submit(&$form, &$form_state);
+  views_ui_cache_set($form_state['view']);
+  $form_state['redirect'] = 'admin/build/views/edit/' . $form_state['view']->name;
+}
+
 /**
  * Form constructor callback to edit display of a view
  */
diff --git plugins/views_plugin_query.inc plugins/views_plugin_query.inc
index 9f9522e..04e8332 100644
--- plugins/views_plugin_query.inc
+++ plugins/views_plugin_query.inc
@@ -95,5 +95,19 @@ class views_plugin_query extends views_plugin {
     return '';
   }
 
+  function option_definition() {
+    $options = parent::option_definition();
+
+    return $options;
+  }
+  /**
+   * Add settings for the ui.
+   */
+  function options_form(&$form, &$form_state) { }
+
+  function options_validate(&$form, &$form_state) { }
+
+  function options_submit(&$form, &$form_state) { }
+
 
 }
diff --git plugins/views_plugin_query_default.inc plugins/views_plugin_query_default.inc
index 040a465..aaa3a0a 100644
--- plugins/views_plugin_query_default.inc
+++ plugins/views_plugin_query_default.inc
@@ -114,6 +114,20 @@ class views_plugin_query_default extends views_plugin_query{
     );
   }
 
+  function option_definition() {
+    $options = parent::option_definition();
+
+    return $options;
+  }
+  /**
+   * Add settings for the ui.
+   */
+  function options_form(&$form, &$form_state) { }
+
+  function options_validate(&$form, &$form_state) { }
+
+  function options_submit(&$form, &$form_state) { }
+
   // ----------------------------------------------------------------
   // Utility methods to set flags and data.