diff --git a/includes/views/handlers/views_ifempty_handler_field.inc b/includes/views/handlers/views_ifempty_handler_field.inc
index 2f37efc..540c430 100644
--- a/includes/views/handlers/views_ifempty_handler_field.inc
+++ b/includes/views/handlers/views_ifempty_handler_field.inc
@@ -32,14 +32,10 @@ class views_ifempty_handler_field extends views_handler_field {
     // Scan all the fields and add them as options for our field selectors.
     $fields = array(
       0 => '- ' . t('no field selected') . ' -',
-    );
-    foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
-      // We only use fields up to (not including) this one.
-      if ($field == $this->options['id']) {
-        break;
-      }
-      $fields[$field] = $handler->ui_name();
-    }
+    ) + $this->view->display_handler->get_field_labels();
+
+    // We only use fields up to (not including) this one.
+    unset($fields[$this->options['id']]);
 
     $form['emptyfield'] = array(
       '#type' => 'select',