diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f49103a..2a89676e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,11 +32,19 @@ Release date: TBD
 #### Mac
 - Fixed an issue where the application was not avaliable on the Dock after a reboot.
   [#411](https://github.com/mattermost/desktop/issues/411)
+- Fixed an issue where Quick Look doesn't close in file upload dialog.
+  [#498](https://github.com/mattermost/desktop/issues/498)
 
 #### Linux
 - Fixed an issue where the setting was not saved when changing tray icon theme.
   [#456](https://github.com/mattermost/desktop/issues/456)
 
+### New known issues
+
+#### Mac
+- The application crashes when a file upload dialog is canceled without closing Quick Look.
+
+
 ----
 
 ## Release v3.6.0
diff --git a/package.json b/package.json
index 2aba9a84..4e3e4211 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "chai": "^3.5.0",
     "cross-env": "^3.1.4",
     "devtron": "^1.4.0",
-    "electron": "1.6.1",
+    "electron": "1.6.2",
     "electron-builder": "^14.5.3",
     "electron-builder-squirrel-windows": "^15.0.0",
     "electron-connect": "^0.6.1",