diff --git a/lib/OpenLayers/Control/ModifyFeature.js b/lib/OpenLayers/Control/ModifyFeature.js
index 6b0c37ce7b..bd4f656504 100644
--- a/lib/OpenLayers/Control/ModifyFeature.js
+++ b/lib/OpenLayers/Control/ModifyFeature.js
@@ -335,9 +335,9 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
     /**
      * APIMethod: selectFeature
      * Select a feature for modification in standalone mode. In non-standalone
-     * mode, this method is called when the select feature control selects a
-     * feature. Register a listener to the beforefeaturemodified event and
-     * return false to prevent feature modification.
+     * mode, this method is called when a feature is selected by clicking.
+     * Register a listener to the beforefeaturemodified event and return false
+     * to prevent feature modification.
      *
      * Parameters:
      * feature - {<OpenLayers.Feature.Vector>} the selected feature.
@@ -347,7 +347,7 @@ OpenLayers.Control.ModifyFeature = OpenLayers.Class(OpenLayers.Control, {
                 feature.geometry.CLASS_NAME) == -1) {
             return;
         }
-        if (!this.standalone || this.beforeSelectFeature(feature) !== false) {
+        if (this.beforeSelectFeature(feature) !== false) {
             if (this.feature) {
                 this.unselectFeature(this.feature);
             }
diff --git a/tests/Control/ModifyFeature.html b/tests/Control/ModifyFeature.html
index 91a9430340..927ce1fd62 100644
--- a/tests/Control/ModifyFeature.html
+++ b/tests/Control/ModifyFeature.html
@@ -204,7 +204,7 @@
     }
 
     function test_selectFeature(t) {
-        t.plan(9);
+        t.plan(12);
         var map = new OpenLayers.Map('map');
         var layer = new OpenLayers.Layer.Vector("Vectors!", {isBaseLayer: true});
         map.addLayer(layer);