diff --git a/modules/node/views_handler_field_node_link_edit.inc b/modules/node/views_handler_field_node_link_edit.inc
index f082c31..d4a4173 100644
--- a/modules/node/views_handler_field_node_link_edit.inc
+++ b/modules/node/views_handler_field_node_link_edit.inc
@@ -19,6 +19,13 @@ class views_handler_field_node_link_edit extends views_handler_field_node_link {
     $this->options['alter']['path'] = "node/$node->nid/edit";
     $this->options['alter']['query'] = drupal_get_destination();
 
+    if (module_exists('i18n_node') && variable_get_value('i18n_node_translation_switch') && isset($node->language)) {
+      $languages = language_list();
+      if (isset($languages[$node->language])) {
+        $this->options['alter']['language'] = $languages[$node->language];
+      }
+    }
+    
     $text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
     return $text;
   }