diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index 974a7e4cea92e6236a141dd2e33186f8a3bdeaf2..3a58227a19520890058a8da70c1581a46afe8c2c 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "description": "Wax prosemirror UI components",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-components/src/components/comments/ConnectedComment.js b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
index 247c5934ebc864f1a765c3928ea00d79f0159089..a5144b1cf0f14374ef048f9c644b2fd35fa51a51 100644
--- a/wax-prosemirror-components/src/components/comments/ConnectedComment.js
+++ b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
@@ -73,6 +73,7 @@ export default ({ comment, top, commentId, recalculateTops }) => {
         ),
       );
     });
+    activeView.focus();
     recalculateTops();
   };
 
diff --git a/wax-prosemirror-components/src/components/link/LinkComponent.js b/wax-prosemirror-components/src/components/link/LinkComponent.js
index 76ff2dc6a635741cca21048fe23925b844bb1dbd..c9c44e1220a3d21bea79d72b73be79f92ed5fc3e 100644
--- a/wax-prosemirror-components/src/components/link/LinkComponent.js
+++ b/wax-prosemirror-components/src/components/link/LinkComponent.js
@@ -151,6 +151,7 @@ const LinkComponent = ({ mark, setPosition, position }) => {
           .setMeta('addToHistory', false)
           .removeMark(mark.from, mark.to, state.schema.marks.link),
       );
+      activeView.focus();
       return false;
     }
     setLinkHref(lastLinkMark.attrs.href);
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index 7829d1e707a4b879f3092c2be8e263315b006bea..a8e57976fd75455641ba8780bf33b7d52b85c4f3 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "description": "Wax prosemirror core",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-layouts/package.json b/wax-prosemirror-layouts/package.json
index 89e05ab5a27798520683a984e45c0ba1b4e310c9..3b5d0f4c0ac4946cd6dd89f5bb6fe3064cc07228 100644
--- a/wax-prosemirror-layouts/package.json
+++ b/wax-prosemirror-layouts/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "description": "Wax prosemirror layouts",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 03eff42cff0205ce115a88eb3fef0e92357f715f..6b89d1f3a4310c830023e7ad6fb6e6d286ebbdc0 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "description": "Wax prosemirror plugins",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index 4b64ae3a27c358d954f85372c896aa1d640b4be3..929c1e26dfd1c65e3f8b4d18bbf1a2b95a733497 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "description": "Wax prosemirror schema",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index 219a5a413cec3013ec5919b5e35caac41a92337f..b680d693cde3a047f659eabadfb6d27f9f0a2a3c 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "description": "Wax prosemirror services",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-themes/package.json b/wax-prosemirror-themes/package.json
index d76ccd548c6ec5eaf233613ac2a6e9d05ff45679..be313502711492f174e2a331e26660492fd20685 100644
--- a/wax-prosemirror-themes/package.json
+++ b/wax-prosemirror-themes/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "description": "Wax prosemirror themes",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"
diff --git a/wax-prosemirror-utilities/package.json b/wax-prosemirror-utilities/package.json
index 7abc880664740b89321390ab11f4fc7ea8424da8..11c08b7315166b71632ed6871734fdccb8ea6a1f 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.16",
   "description": "Wax prosemirror utilities",
   "license": "MIT",
-  "main": "index.js",
+  "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "BABEL_ENV=production rollup -c"