diff --git a/web/src/js/components/editor.js b/web/src/js/components/editor.js
index 129fef08a..f2d445667 100644
--- a/web/src/js/components/editor.js
+++ b/web/src/js/components/editor.js
@@ -10,7 +10,7 @@ var nodeToContent = function (node) {
 };
 
 /*
-Basic Editor Functionality
+ Basic Editor Functionality
  */
 var EditorBase = React.createClass({
     propTypes: {
@@ -18,6 +18,7 @@ var EditorBase = React.createClass({
         onDone: React.PropTypes.func.isRequired,
         contentToHtml: React.PropTypes.func,
         nodeToContent: React.PropTypes.func, // content === nodeToContent( Node<innerHTML=contentToHtml(content)> )
+        onStop: React.PropTypes.func,
         submitOnEnter: React.PropTypes.bool,
         className: React.PropTypes.string,
         tag: React.PropTypes.string
@@ -46,6 +47,8 @@ var EditorBase = React.createClass({
             className={className}
             contentEditable={this.state.editable || undefined } // workaround: use undef instead of false to remove attr
             onFocus={this.onFocus}
+            onMouseDown={this.onMouseDown}
+            onClick={this.onClick}
             onBlur={this._stop}
             onKeyDown={this.onKeyDown}
             onInput={this.onInput}
@@ -53,29 +56,75 @@ var EditorBase = React.createClass({
             dangerouslySetInnerHTML={html}
         />;
     },
-    onPaste: function(e){
+    onPaste: function (e) {
         e.preventDefault();
         var content = e.clipboardData.getData("text/plain");
         document.execCommand("insertHTML", false, content);
     },
+    onMouseDown: function (e) {
+        this._mouseDown = true;
+        window.addEventListener("mouseup", this.onMouseUp);
+        this.props.onMouseDown && this.props.onMouseDown(e);
+    },
+    onMouseUp: function () {
+        if (this._mouseDown) {
+            this._mouseDown = false;
+            window.removeEventListener("mouseup", this.onMouseUp)
+        }
+    },
+    onClick: function (e) {
+        this.onMouseUp();
+        this.onFocus(e);
+    },
     onFocus: function (e) {
+        console.log("onFocus", this._mouseDown, this._ignore_events, this.state.editable);
+        if (this._mouseDown || this._ignore_events || this.state.editable) {
+            return;
+        }
+
+        //contenteditable in FireFox is more or less broken.
+        // - we need to blur() and then focus(), otherwise the caret is not shown.
+        // - blur() + focus() == we need to save the caret position before
+        //   Firefox sometimes just doesn't set a caret position => use caretPositionFromPoint
+        var sel = window.getSelection();
+        var range;
+        if (sel.rangeCount > 0) {
+            range = sel.getRangeAt(0);
+        } else if (document.caretPositionFromPoint && e.clientX && e.clientY) {
+            var pos = document.caretPositionFromPoint(e.clientX, e.clientY);
+            range = document.createRange();
+            range.setStart(pos.offsetNode, pos.offset);
+        } else if (document.caretRangeFromPoint && e.clientX && e.clientY) {
+            range = document.caretRangeFromPoint(e.clientX, e.clientY);
+        } else {
+            range = document.createRange();
+            range.selectNodeContents(React.findDOMNode(this));
+        }
+
+        this._ignore_events = true;
         this.setState({editable: true}, function () {
-            React.findDOMNode(this).focus();
-            var range = document.createRange();
-            range.selectNodeContents(this.getDOMNode());
-            var sel = window.getSelection();
-            sel.removeAllRanges();
-            sel.addRange(range);
+            var node = React.findDOMNode(this);
+            node.blur();
+            node.focus();
+            this._ignore_events = false;
+            //sel.removeAllRanges();
+            //sel.addRange(range);
+
+
         });
-        this.props.onFocus && this.props.onFocus(e);
     },
     stop: function () {
         // a stop would cause a blur as a side-effect.
         // but a blur event must trigger a stop as well.
         // to fix this, make stop = blur and do the actual stop in the onBlur handler.
         React.findDOMNode(this).blur();
+        this.props.onStop && this.props.onStop();
     },
     _stop: function (e) {
+        if (this._ignore_events) {
+            return;
+        }
+        console.log("_stop", _.extend({}, e));
         window.getSelection().removeAllRanges(); //make sure that selection is cleared on blur
         var node = React.findDOMNode(this);
         var content = this.props.nodeToContent(node);
@@ -83,16 +132,16 @@ var EditorBase = React.createClass({
         this.props.onDone(content);
         this.props.onBlur && this.props.onBlur(e);
     },
-    cancel: function () {
+    reset: function () {
         React.findDOMNode(this).innerHTML = this.props.contentToHtml(this.props.content);
-        this.stop();
     },
     onKeyDown: function (e) {
         e.stopPropagation();
         switch (e.keyCode) {
             case utils.Key.ESC:
                 e.preventDefault();
-                this.cancel();
+                this.reset();
+                this.stop();
                 break;
             case utils.Key.ENTER:
                 if (this.props.submitOnEnter && !e.shiftKey) {
@@ -112,7 +161,7 @@ var EditorBase = React.createClass({
 });
 
 /*
-Add Validation to EditorBase
+ Add Validation to EditorBase
  */
 var ValidateEditor = React.createClass({
     propTypes: {
@@ -122,15 +171,15 @@ var ValidateEditor = React.createClass({
         isValid: React.PropTypes.func,
         className: React.PropTypes.string,
     },
-    getInitialState: function(){
+    getInitialState: function () {
         return {
             currentContent: this.props.content
         };
     },
-    componentWillReceiveProps: function(){
+    componentWillReceiveProps: function () {
         this.setState({currentContent: this.props.content});
     },
-    onInput: function(content){
+    onInput: function (content) {
         this.setState({currentContent: content});
         this.props.onInput && this.props.onInput(content);
     },
@@ -152,8 +201,8 @@ var ValidateEditor = React.createClass({
         />;
     },
     onDone: function (content) {
-        if(this.props.isValid && !this.props.isValid(content)){
-            this.refs.editor.cancel();
+        if (this.props.isValid && !this.props.isValid(content)) {
+            this.refs.editor.reset();
             content = this.props.content;
         }
         this.props.onDone(content);
@@ -161,7 +210,7 @@ var ValidateEditor = React.createClass({
 });
 
 /*
-Text Editor with mitmweb-specific convenience features
+ Text Editor with mitmweb-specific convenience features
  */
 var ValueEditor = React.createClass({
     mixins: [common.ChildFocus],
@@ -174,18 +223,15 @@ var ValueEditor = React.createClass({
         var tag = this.props.inline ? "span" : "div";
         return <ValidateEditor
             {...this.props}
-            onBlur={this.onBlur}
+            onStop={this.onStop}
             tag={tag}
         />;
     },
     focus: function () {
         React.findDOMNode(this).focus();
     },
-    onBlur: function(e){
-        if(!e.relatedTarget){
-            this.returnFocus();
-        }
-        this.props.onBlur && this.props.onBlur(e);
+    onStop: function () {
+        this.returnFocus();
     }
 });