simplify stop edit

2 files changed, 4 insertions, 4 deletions

diff --git a/web/src/js/components/ContentView/ContentLoader.jsx b/web/src/js/components/ContentView/ContentLoader.jsx
index 094ce18b..ba6702ca 100644
--- a/web/src/js/components/ContentView/ContentLoader.jsx
+++ b/web/src/js/components/ContentView/ContentLoader.jsx
@@ -45,12 +45,12 @@ export default View => class extends React.Component {
             this.state.request.abort()
         }
         // We have a few special cases where we do not need to make an HTTP request.
-        if(props.message.contentLength === 0 || props.message.contentLength === null){
-            return this.setState({request: undefined, content: ""})
-        }
         if(props.message.content !== undefined) {
             return this.setState({request: undefined, content: props.message.content})
         }
+        if(props.message.contentLength === 0 || props.message.contentLength === null){
+            return this.setState({request: undefined, content: ""})
+        }
 
         let requestUrl = MessageUtils.getContentURL(props.flow, props.message)
 
diff --git a/web/src/js/components/ValueEditor/ValueEditor.jsx b/web/src/js/components/ValueEditor/ValueEditor.jsx
index dd9c2cde..852f82c4 100644
--- a/web/src/js/components/ValueEditor/ValueEditor.jsx
+++ b/web/src/js/components/ValueEditor/ValueEditor.jsx
@@ -59,7 +59,7 @@ export default class ValueEditor extends Component {
         return (
             <div
                 ref={input => this.input = input}
-                tabIndex={!this.props.readonly && "0"}
+                tabIndex={this.props.readonly ? undefined : 0}
                 className={className}
                 contentEditable={this.state.editable || undefined}
                 onFocus={this.onFocus}