diff --git a/data/vinagre.ui b/data/vinagre.ui
index 33c99ec..93e2560 100644
--- a/data/vinagre.ui
+++ b/data/vinagre.ui
@@ -17,7 +17,7 @@
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkLabel" id="label1">
+          <object class="GtkLabel" id="label11">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="xalign">0</property>
@@ -61,7 +61,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="host_label">
+              <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="xalign">0</property>
@@ -101,7 +101,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="protocol_label">
+              <object class="GtkLabel" id="label22">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Protocol:</property>
@@ -174,7 +174,7 @@
           <object class="GtkHBox" id="hbox2">
             <property name="visible">True</property>
             <child>
-              <object class="GtkLabel" id="label3">
+              <object class="GtkLabel" id="label21">
                 <property name="visible">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label">  </property>
@@ -540,7 +540,7 @@
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox3">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="label15">
@@ -688,7 +688,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox2">
+              <object class="GtkHBox" id="hbox4">
                 <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="label3">
@@ -703,7 +703,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="fullscreen_check">
+                  <object class="GtkCheckButton" id="bookmark_fullscreen_check">
                     <property name="label" translatable="yes">_Full screen</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -753,7 +753,7 @@
               <object class="GtkHBox" id="folder_box">
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkLabel" id="label22">
+                  <object class="GtkLabel" id="label24">
                     <property name="visible">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label">    </property>
@@ -862,7 +862,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkHBox" id="hbox5">
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
                 <child>
diff --git a/vinagre/vinagre-bookmarks-ui.c b/vinagre/vinagre-bookmarks-ui.c
index 71fdbf6..441456f 100644
--- a/vinagre/vinagre-bookmarks-ui.c
+++ b/vinagre/vinagre-bookmarks-ui.c
@@ -133,7 +133,7 @@ show_dialog_conn (VinagreBookmarks      *book,
   dialog         = GTK_WIDGET (gtk_builder_get_object (xml, "bookmarks_add_edit_conn_dialog"));
   name_entry     = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_name_entry"));
   host_entry     = GTK_WIDGET (gtk_builder_get_object (xml, "edit_bookmark_host_entry"));
-  fs_check       = GTK_WIDGET (gtk_builder_get_object (xml, "fullscreen_check"));
+  fs_check       = GTK_WIDGET (gtk_builder_get_object (xml, "bookmark_fullscreen_check"));
   folder_box     = GTK_WIDGET (gtk_builder_get_object (xml, "folder_box"));
   plugin_box     = GTK_WIDGET (gtk_builder_get_object (xml, "plugin_options_vbox"));
   save_button    = GTK_WIDGET (gtk_builder_get_object (xml, "save_button"));