diff --git a/i18n_menu/i18n_menu.module b/i18n_menu/i18n_menu.module
index b7bd737..185bc73 100644
--- a/i18n_menu/i18n_menu.module
+++ b/i18n_menu/i18n_menu.module
@@ -665,7 +665,15 @@ function i18n_menu_form_menu_edit_item_alter(&$form, &$form_state) {
         $translation_set = i18n_translation_set_build('menu_link')
           ->add_item($source_item);
       }
-      $form['link_path']['#default_value'] = $source_item['link_path'];
+
+      $path = $source_item['link_path'];
+      if (isset($source_item['options']['query'])) {
+        $path .= '?' . drupal_http_build_query($source_item['options']['query']);
+      }
+      if (isset($source_item['options']['fragment'])) {
+        $path .= '#' . $source_item['options']['fragment'];
+      }
+      $form['link_path']['#default_value'] = $path;
 
       // Maybe we should disable the 'link_path' and 'parent' form elements?
       // $form['link_path']['#disabled'] = TRUE;
@@ -988,4 +996,3 @@ function i18n_menu_init() {
     }
   }
 }
-