--- a/src/cagou/kv/menu.kv	Sat Dec 24 14:20:40 2016 +0100
+++ b/src/cagou/kv/menu.kv	Sat Dec 24 14:20:49 2016 +0100
@@ -14,24 +14,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-<MenuItem>:
-    size_hint: None, 1
-    padding: 10, 0
-    width: self.texture_size[0]
-    height: 30
-
-<MenuSeparator>:
-    size_hint: None, None
-    width: 30
-
-<MenuContainer>:
-    size_hint: None, 1
-    width: self.texture_size[0] + dp(20)
-    background_color: 0, 0, 0, 1
-
-<MenusWidget>:
-    size_hint: 1, None
-    height: 30
 
 <AboutContent>:
     text_size: self.size
@@ -41,3 +23,13 @@
 <AboutPopup>:
     title_align: "center"
     size_hint: 0.8, 0.8
+
+<MenuItem>:
+    # following is need to fix a bug in contextmenu
+    size_hint: 1, None
+
+<MenusWidget>:
+    height: self.children[0].height if self.children else 30
+
+<MainMenu>:
+    cancel_handler_widget: self.parent