diff --git a/ui/window.xml b/ui/window.xml
index 1ad625a..892ccb1 100644
--- a/ui/window.xml
+++ b/ui/window.xml
@@ -72,97 +72,111 @@
 
   <menu id="popup-over-selected-area">
 
-    <section>
+    <item>
+      <attribute name="label" translatable="yes">Save selected</attribute>
+      <attribute name="action">win.save_selected</attribute>
+    </item>
+
+    <item>
+      <attribute name="label" translatable="yes">Print selected</attribute>
+      <attribute name="action">win.print_selected</attribute>
+    </item>
+
+    <submenu>
+
+      <attribute name='label' translatable='yes'>Options</attribute>
 
         <item>
-          <attribute name="label" translatable="yes">Save selected</attribute>
-          <attribute name="action">win.save_selected</attribute>
+          <attribute name="label" translatable="yes">Show toolbar</attribute>
+          <attribute name="action">win.toolbar</attribute>
         </item>
 
         <item>
-          <attribute name="label" translatable="yes">Print selected</attribute>
-          <attribute name="action">win.print_selected</attribute>
+          <attribute name="label" translatable="yes">Show menu</attribute>
+          <attribute name="action">win.menubar</attribute>
         </item>
 
-    </section>
-
-    <section>
+        <item>
+          <attribute name="label" translatable="yes">Full screen</attribute>
+          <attribute name="action">win.fullscreen</attribute>
+        </item>
 
-      <item>
-        <attribute name="label" translatable="yes">Show toolbar</attribute>
-        <attribute name="action">win.toolbar</attribute>
-      </item>
+    </submenu>
 
-      <item>
-        <attribute name="label" translatable="yes">Show menu</attribute>
-        <attribute name="action">win.menubar</attribute>
-      </item>
-
-    </section>
+    <item>
+      <attribute name="label" translatable="yes">Disconnect</attribute>
+      <attribute name="action">win.disconnect</attribute>
+    </item>
 
   </menu>
 
   <menu id="popup-over-unselected-area">
 
-    <section>
+    <item>
+      <attribute name="label" translatable="yes">Send/Receive files</attribute>
+      <attribute name="action">win.file.transfer</attribute>
+    </item>
+
+    <submenu>
+
+      <attribute name='label' translatable='yes'>Options</attribute>
 
         <item>
-          <attribute name="label" translatable="yes">Send/Receive files</attribute>
-          <attribute name="action">win.file.transfer</attribute>
+          <attribute name="label" translatable="yes">Show toolbar</attribute>
+          <attribute name="action">win.toolbar</attribute>
         </item>
 
         <item>
-          <attribute name="label" translatable="yes">Disconnect</attribute>
-          <attribute name="action">win.disconnect</attribute>
+          <attribute name="label" translatable="yes">Show menu</attribute>
+          <attribute name="action">win.menubar</attribute>
         </item>
 
-    </section>
-
-    <section>
-
-      <item>
-        <attribute name="label" translatable="yes">Show toolbar</attribute>
-        <attribute name="action">win.toolbar</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">Full screen</attribute>
+          <attribute name="action">win.fullscreen</attribute>
+        </item>
 
-      <item>
-        <attribute name="label" translatable="yes">Show menu</attribute>
-        <attribute name="action">win.menubar</attribute>
-      </item>
+    </submenu>
 
-    </section>
+    <item>
+      <attribute name="label" translatable="yes">Disconnect</attribute>
+      <attribute name="action">win.disconnect</attribute>
+    </item>
 
   </menu>
 
   <menu id="popup-when-offline">
 
-    <section>
+    <item>
+      <attribute name="label" translatable="yes">_Connect</attribute>
+      <attribute name="action">win.connect</attribute>
+    </item>
 
-      <item>
-        <attribute name="label" translatable="yes">_Connect</attribute>
-        <attribute name="action">win.connect</attribute>
-      </item>
+    <item>
+      <attribute name="label" translatable="yes">Configure host</attribute>
+      <attribute name="action">win.set.host</attribute>
+    </item>
 
-      <item>
-        <attribute name="label" translatable="yes">Configure host</attribute>
-        <attribute name="action">win.set.host</attribute>
-      </item>
+    <submenu>
 
-    </section>
+      <attribute name='label' translatable='yes'>Options</attribute>
 
-    <section>
+        <item>
+          <attribute name="label" translatable="yes">Show toolbar</attribute>
+          <attribute name="action">win.toolbar</attribute>
+        </item>
 
-      <item>
-        <attribute name="label" translatable="yes">Show toolbar</attribute>
-        <attribute name="action">win.toolbar</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">Show menu</attribute>
+          <attribute name="action">win.menubar</attribute>
+        </item>
 
-      <item>
-        <attribute name="label" translatable="yes">Show menu</attribute>
-        <attribute name="action">win.menubar</attribute>
-      </item>
+        <item>
+          <attribute name="label" translatable="yes">Full screen</attribute>
+          <attribute name="action">win.fullscreen</attribute>
+        </item>
 
-    </section>
+    </submenu>
 
     <item>
       <attribute name="label" translatable="yes">Quit application</attribute>
--
libgit2 0.21.2