diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f4ce13d..03c47924 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,9 +14,20 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 
 <!-- Add changelog entries for new changes under this section -->
 
- * **Bug Fix**
+* **Bug Fix**
    * Add leading zero to hour & minute on `<title />` when needed ([#314](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/314) by [@mhxbe](https://github.com/mhxbe))
 
+## 3.6.0
+
+ * **Improvement**
+   * Support webpack builds where `output.globalObject` is set to `'self'` ([#323](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/323) by [@lemonmade](https://github.com/lemonmade))
+   * Improve readability of tooltips ([#320](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/320) by [@lorenzos](https://github.com/lorenzos))
+
+## 3.5.2
+
+ * **Bug Fix**
+   * Fix sidebar not showing visibility status of chunks hidden via popup menu (issue [#316](https://github.com/webpack-contrib/webpack-bundle-analyzer/issues/316) by [@gaokun](https://github.com/gaokun), fixed in [#317](https://github.com/webpack-contrib/webpack-bundle-analyzer/pull/317) by [@bregenspan](https://github.com/bregenspan))
+
 ## 3.5.1
 
  * **Bug Fix**
diff --git a/client/components/CheckboxList.jsx b/client/components/CheckboxList.jsx
index efc3e01e..f8b37a91 100644
--- a/client/components/CheckboxList.jsx
+++ b/client/components/CheckboxList.jsx
@@ -33,6 +33,8 @@ export default class CheckboxList extends PureComponent {
         this.setState({checkedItems});
         this.informAboutChange(checkedItems);
       }
+    } else if (newProps.checkedItems !== this.props.checkedItems) {
+      this.setState({checkedItems: newProps.checkedItems});
     }
   }
 
diff --git a/client/components/Tooltip.css b/client/components/Tooltip.css
index 732ad61a..5c72c1b9 100644
--- a/client/components/Tooltip.css
+++ b/client/components/Tooltip.css
@@ -5,7 +5,7 @@
   border-radius: 4px;
   background: #fff;
   border: 1px solid #aaa;
-  opacity: 0.7;
+  opacity: 0.9;
   white-space: nowrap;
   visibility: visible;
   transition: opacity .2s ease, visibility .2s ease;
diff --git a/client/viewer.css b/client/viewer.css
index e4cb0ea7..f10404d8 100644
--- a/client/viewer.css
+++ b/client/viewer.css
@@ -1,5 +1,5 @@
 :root {
-  --main-font: normal 11px Verdana;
+  --main-font: normal 11px Verdana, sans-serif;
 }
 
 :global html,
diff --git a/package-lock.json b/package-lock.json
index a5c01ac7..ac2ab45a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack-bundle-analyzer",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ec4cd1a0..63ef6bb1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack-bundle-analyzer",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Webpack plugin and CLI utility that represents bundle content as convenient interactive zoomable treemap",
   "author": "Yury Grunin <grunin.ya@ya.ru>",
   "license": "MIT",
diff --git a/src/parseUtils.js b/src/parseUtils.js
index 6e5dee88..b4dfeff2 100644
--- a/src/parseUtils.js
+++ b/src/parseUtils.js
@@ -185,6 +185,8 @@ function isAsyncChunkPushExpression(node) {
     callee.object.left.object &&
     (
       callee.object.left.object.name === 'window' ||
+      // `self` is a common output.globalObject value used to support both workers and browsers
+      callee.object.left.object.name === 'self' ||
       // Webpack 4 uses `this` instead of `window`
       callee.object.left.object.type === 'ThisExpression'
     ) &&
diff --git a/test/bundles/validWebpack4AsyncChunkUsingSelfInsteadOfWindow.js b/test/bundles/validWebpack4AsyncChunkUsingSelfInsteadOfWindow.js
new file mode 100644
index 00000000..9e509fd9
--- /dev/null
+++ b/test/bundles/validWebpack4AsyncChunkUsingSelfInsteadOfWindow.js
@@ -0,0 +1 @@
+(self.webpackJsonp=self.webpackJsonp||[]).push([[27],{1:function(e,n,t){console.log("Chuck Norris")}}]);
diff --git a/test/bundles/validWebpack4AsyncChunkUsingSelfInsteadOfWindow.modules.json b/test/bundles/validWebpack4AsyncChunkUsingSelfInsteadOfWindow.modules.json
new file mode 100644
index 00000000..cabfce7a
--- /dev/null
+++ b/test/bundles/validWebpack4AsyncChunkUsingSelfInsteadOfWindow.modules.json
@@ -0,0 +1,5 @@
+{
+  "modules": {
+    "1": "function(e,n,t){console.log(\"Chuck Norris\")}"
+  }
+}