diff --git a/src/containers/visualization.js b/src/containers/visualization.js
index fbc1589..9d108fa 100644
--- a/src/containers/visualization.js
+++ b/src/containers/visualization.js
@@ -330,7 +330,7 @@ class Visualization extends Component {
           )}
         </div>
 
-        <div className="box box-content">
+        <div className="box box-content" onContextMenu={ (e) => e.preventDefault() }>
           {this.state.editing &&
             <div className="toolbox box-header">
               <ToolboxItem name="Value" type="widget" />
diff --git a/src/containers/widget.js b/src/containers/widget.js
index 8cde808..163e0b4 100644
--- a/src/containers/widget.js
+++ b/src/containers/widget.js
@@ -48,6 +48,13 @@ class Widget extends Component {
     }
   }
 
+  constructor(props) {
+    super(props);
+
+    // Reference to the context menu element
+    this.contextMenuTriggerViaDraggable = null;
+  }
+
   componentWillMount() {
     AppDispatcher.dispatch({
       type: 'files/start-load'
@@ -82,7 +89,20 @@ class Widget extends Component {
     this.props.onWidgetChange(widget, this.props.index);
   }
 
+  borderWasClicked(e) {
+    // check if it was triggered by the right button
+    if (e.button === 2) {
+      // launch the context menu using the reference
+      if(this.contextMenuTriggerViaDraggable) {
+          this.contextMenuTriggerViaDraggable.handleContextClick(e);
+      }
+    }
+  }
+
   render() {
+    
+    
+
     //console.log('render widget ' + this.props.data.z + this.props.data.type);
 
     // configure grid
@@ -119,13 +139,14 @@ class Widget extends Component {
           minHeight={ widget.minHeight }
           bounds={'parent'}
           className="widget"
+          onResizeStart={ (direction, styleSize, clientSize, event) => this.borderWasClicked(event) } 
           onResizeStop={(direction, styleSize, clientSize, delta) => this.resizeStop(direction, styleSize, clientSize, delta)}
           onDragStop={(event, ui) => this.dragStop(event, ui)}
           moveGrid={grid}
           resizeGrid={grid}
           zIndex={widget.z}
         >
-          <ContextMenuTrigger id={'widgetMenu' + this.props.index} attributes={{ style: { width: '100%', height: '100%' } }}>
+          <ContextMenuTrigger id={'widgetMenu' + this.props.index} ref={c => this.contextMenuTriggerViaDraggable = c} >
             {element}
           </ContextMenuTrigger>
         </Rnd>