diff --git a/includes/behaviors/js/openlayers_behavior_popup.js b/includes/behaviors/js/openlayers_behavior_popup.js
index 928ecec..3d8ced5 100644
--- a/includes/behaviors/js/openlayers_behavior_popup.js
+++ b/includes/behaviors/js/openlayers_behavior_popup.js
@@ -54,6 +54,11 @@ Drupal.behaviors.openlayers_behavior_popup = function(context) {
       }
     }
 
+    // if only 1 layer exists, do not add as an array
+    if (layers.length == 1) {
+      layers = layers[0];
+    }
+
     popupSelect = new OpenLayers.Control.SelectFeature(layers,
       {
         onSelect: function (feature) {
diff --git a/includes/behaviors/js/openlayers_behavior_tooltip.js b/includes/behaviors/js/openlayers_behavior_tooltip.js
index 1d355c9..d2b14f7 100644
--- a/includes/behaviors/js/openlayers_behavior_tooltip.js
+++ b/includes/behaviors/js/openlayers_behavior_tooltip.js
@@ -44,6 +44,11 @@ Drupal.behaviors.openlayers_behavior_tooltip = function(context) {
       }
     }
 
+    // if only 1 layer exists, do not add as an array
+    if (layers.length == 1) {
+      layers = layers[0];
+    }
+
     // Define feature select events for selected layers.
     popupSelect = new OpenLayers.Control.SelectFeature(layers, 
       {