diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json
index 762a69959e..974275401a 100755
--- a/packages/strapi-bookshelf/package.json
+++ b/packages/strapi-bookshelf/package.json
@@ -55,4 +55,4 @@
     "npm": ">= 5.3.0"
   },
   "license": "MIT"
-}
+}
\ No newline at end of file
diff --git a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/index.js b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/index.js
index 46a763e4a0..a3ce40161e 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/index.js
@@ -49,7 +49,6 @@ class Wysiwyg extends React.Component {
     super(props);
     this.state = {
       editorState: EditorState.createEmpty(),
-      isFocused: false,
       initialValue: '',
       isDraging: false,
       isPreviewMode: false,
@@ -57,11 +56,9 @@ class Wysiwyg extends React.Component {
       isFullscreen: false,
     };
     this.focus = () => {
-      this.setState({ isFocused: true });
       return this.domEditor.focus();
     };
     this.blur = () => {
-      this.setState({ isFocused: false });
       return this.domEditor.blur();
     };
   }
@@ -70,7 +67,6 @@ class Wysiwyg extends React.Component {
     handleChangeSelect: this.handleChangeSelect,
     headerValue: this.state.headerValue,
     html: this.props.value,
-    isFocused: this.state.isFocused,
     isPreviewMode: this.state.isPreviewMode,
     isFullscreen: this.state.isFullscreen,
     placeholder: this.props.placeholder,
@@ -504,7 +500,7 @@ class Wysiwyg extends React.Component {
   );
 
   render() {
-    const { editorState, isFocused, isPreviewMode, isFullscreen } = this.state;
+    const { editorState, isPreviewMode, isFullscreen } = this.state;
     const editorStyle = isFullscreen ? { marginTop: '0' } : this.props.style;
 
     return (
@@ -513,10 +509,8 @@ class Wysiwyg extends React.Component {
         <div
           className={cn(
             styles.editorWrapper,
-            this.state.isFocused && styles.editorFocus,
             !this.props.deactivateErrorHighlight && this.props.error && styles.editorError,
             !isEmpty(this.props.className) && this.props.className,
-            isFullscreen && isFocused && styles.fullscreenFocus,
           )}
           onClick={e => {
             if (isFullscreen) {
@@ -590,7 +584,7 @@ class Wysiwyg extends React.Component {
         {/* PREVIEW WYSIWYG FULLSCREEN */}
         {isFullscreen && (
           <div
-            className={cn(styles.editorWrapper, isFocused && styles.fullscreenPreviewFocused)}
+            className={cn(styles.editorWrapper)}
             onClick={e => {
               e.preventDefault();
               e.stopPropagation();
@@ -613,7 +607,6 @@ Wysiwyg.childContextTypes = {
   handleChangeSelect: PropTypes.func,
   headerValue: PropTypes.string,
   html: PropTypes.string,
-  isFocused: PropTypes.bool,
   isFullscreen: PropTypes.bool,
   isPreviewMode: PropTypes.bool,
   placeholder: PropTypes.string,
diff --git a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/link.js b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/link.js
index 587cb87f86..0d7742a606 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/link.js
+++ b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/link.js
@@ -11,7 +11,13 @@ const Link = props => {
   const { url } = props.contentState.getEntity(props.entityKey).getData();
 
   return (
-    <a href={url}>
+    <a
+      href={url}
+      onClick={() => {
+        window.open(url, '_blank');
+      }}
+      style={{ cursor: 'pointer' }}
+    >
       {props.children}
     </a>
   );
diff --git a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/styles.scss b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/styles.scss
index 6d728e1bd7..a8884e87a4 100644
--- a/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/styles.scss
+++ b/packages/strapi-helper-plugin/lib/src/components/Wysiwyg/styles.scss
@@ -53,10 +53,6 @@
   }
 }
 
-.editorFocus {
-  border-color: #78caff !important;
-}
-
 .editorError {
   border-color: #ff203c !important;
 }
@@ -66,10 +62,6 @@
   width: 0;
 }
 
-.fullscreenPreviewFocused {
-  border-color: #78caff !important;
-  border-left-color: #E3E9F3 !important;
-}
 .editorBlockquote {
   border-left: 5px solid #eee;
   font-family: Lato;
@@ -110,10 +102,6 @@
   }
 }
 
-.fullscreenFocus {
-  border-right-color: #E3E9F3 !important;
-}
-
 .editorFullScreen {
   max-height: calc(100% - 70px) !important;
   margin-bottom: 0;