diff --git a/js/component/menu.js b/js/component/menu.js
index ee3901b78..cf76ec047 100644
--- a/js/component/menu.js
+++ b/js/component/menu.js
@@ -2,11 +2,6 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import {Icon} from './common.js';
 
-// Generic menu styles
-export let menuStyle = {
-  whiteSpace: 'nowrap'
-};
-
 export let Menu = React.createClass({
   propTypes: {
     onClickOut: React.PropTypes.func.isRequired,
@@ -34,9 +29,6 @@ export let Menu = React.createClass({
   }
 });
 
-export let menuItemStyle = {
-  display: 'block',
-};
 export let MenuItem = React.createClass({
   propTypes: {
     href: React.PropTypes.string,
@@ -53,7 +45,7 @@ export let MenuItem = React.createClass({
     var icon = (this.props.icon ? <Icon icon={this.props.icon} fixed /> : null);
 
     return (
-      <a style={menuItemStyle} className="button-text no-underline" onClick={this.props.onClick}
+      <a className="button-text menu__menu-item" onClick={this.props.onClick}
          href={this.props.href || 'javascript:'} label={this.props.label}>
         {this.props.iconPosition == 'left' ? icon : null}
         {this.props.label}
diff --git a/scss/_gui.scss b/scss/_gui.scss
index a13a5cf5f..a131f0c2d 100644
--- a/scss/_gui.scss
+++ b/scss/_gui.scss
@@ -397,6 +397,18 @@ input[type="text"], input[type="search"]
   word-break: break-all;
 }
 
+.menu {
+  white-space: nowrap;
+}
+
+.menu__menu-item {
+  display: block;
+  text-decoration: none !important;
+  &:hover {
+    text-decoration: underline !important;
+  }
+}
+
 
 .file-tile--compact {
   height: 180px;