diff -u b/template.php b/template.php
--- b/template.php
+++ b/template.php
@@ -209,6 +209,13 @@
  * @see views_ui_edit_form_get_bucket()
  */
 function ember_views_ui_display_tab_alter(&$build, &$view, $display_id) {
+
+  // First check that the setting is enabled.
+  if (theme_get_setting('views_ui_override') == FALSE) {
+    // Do nothing if the setting is not enabled.
+    return;
+  }
+
   $display = $view->display[$display_id];
   $root_url = "admin/structure/views/nojs/config-item/$view->name/$display_id";
 
@@ -270,7 +277,7 @@
  */
 function _ember_views_ui_field_link($field, $handler, array $relationships, $type, $root_url) {
   // If an administrative title is set, use that for anchor text.
-  if (isset($field['ui_name'])) {
+  if (isset($field['ui_name']) && $field['ui_name'] != FALSE) {
     $link_text = $field['ui_name'];
   }
   // Otherwise, build up some structured anchor text.
only in patch2:
unchanged:
--- a/ember.info
+++ b/ember.info
@@ -13,6 +13,7 @@ stylesheets[screen][] = styles/system.messages.css
 
 ; Settings
 settings[shortcut_module_link] = 1
+settings[views_ui_override] = 1
 
 ; Regions
 regions[content] = Content
only in patch2:
unchanged:
--- a/theme-settings.php
+++ b/theme-settings.php
@@ -21,4 +21,11 @@ function ember_form_system_theme_settings_alter(&$form, &$form_state) {
     '#default_value' => theme_get_setting('ember_no_fadein_effect'),
     '#description' => t('If checked, the fade-in effect will not occur.'),
   );
+  $form['ember']['views_ui_override'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Enable Views UI overrides'),
+    '#default_value' => theme_get_setting('views_ui_override'),
+    '#description' => t('Ember makes several improvements to the Views admin interface. You can disable those overrides here.'),
+  );
+
 }