diff --git a/relation_select.module b/relation_select.module
index ace5eea..11a0a2f 100644
--- a/relation_select.module
+++ b/relation_select.module
@@ -852,18 +852,17 @@ function relation_select_ajax(){
 }
 
 /**
- * Get a list of all views
+ * Get a list of all enabled views with relation_select displays.
+ * @return array A list of views as "Name : Title" keyed by 'view_name:display_id'.
  */
-function relation_select_get_views(){
+function relation_select_get_views() {
   $views = array();
-  foreach(views_get_enabled_views() as $name => $view) {
-    foreach(array_keys($view->display) as $id){
-      $styleplugin = $view->display['default']->display_options['style_plugin'];
-      if ($id != 'default' && isset($view->display[$id]->display_options['style_plugin'])) {
-        $styleplugin = $view->display[$id]->display_options['style_plugin'];
-      }
-      if($view->human_name && $styleplugin == 'relation_select') {
-        $views[$name . ':' . $id] = $view->human_name . ' : ' . $view->display[$id]->display_title;
+  foreach (views_get_enabled_views() as $name => $view) {
+    foreach (array_keys($view->display) as $id) {
+      $styleplugin = isset($view->display[$id]->display_options['style_plugin']) ? $view->display[$id]->display_options['style_plugin'] : NULL;
+      if ($styleplugin == 'relation_select') {
+        $view_name = isset($view->human_name) ? $view->human_name : $name;
+        $views["{$name}:{$id}"] = "{$view_name} : {$view->display[$id]->display_title}";
       }
     }
   }