diff --git a/editablefields.module b/editablefields.module
index 18d8dbd..9d907ae 100644
--- a/editablefields.module
+++ b/editablefields.module
@@ -83,10 +83,10 @@ function theme_editablefields_formatter_editable($element) {
 
   $field_name = $element['#field_name'];
   $field = content_fields($field_name);
-  $node = $element['#node'];
-  //$revision = !empty($element['#node']->vid) ? $element['#node']->vid : NULL;
-  //$node = node_load($element['#node']->nid, $revision);
+
+  // Only pass a vid to node_load() if the provided vid is not the current revision
+  $revision = (!db_result(db_query('SELECT 1 FROM {node} WHERE nid = %d AND vid = %d', $element['#node']->nid, $element['#node']->vid))) ? $element['#node']->vid : NULL;
+  $node = node_load($element['#node']->nid, $revision);
   $delta = $element['#item']['#delta'];
 
   if (content_handle('widget', 'multiple values', $field) == CONTENT_HANDLE_CORE) {