diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46a11c59e..75969110f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,13 @@
     1. [](#bugfix)
         - Fixed inheritance overlay in Layout Manager masking all sections in a block of a container (#2114)
         - Fixed error when cloning a section with no particles (#2116, thanks @drnasin)
+        - Fixed IE Edge issue in admin where the navigation bar would disappear and never reappear (#2118)
 1. [Joomla](#joomla)
     1. [](#new)
         - Added official Joomla 3.8 support (#2111)
     1. [](#bugfix)
         - Fixed particles not using selected timezone (#2072)
+        - Fixed frontend editing error when trying to open media picker (#2102)
 1. [WordPress](#wordpress)
     1. [](#new)
         - Added multi-language support for outline assignments (#634)
diff --git a/assets/common/application/menu/index.js b/assets/common/application/menu/index.js
index 6adf27314..8ae9f9406 100644
--- a/assets/common/application/menu/index.js
+++ b/assets/common/application/menu/index.js
@@ -44,10 +44,15 @@ var Menu = new prime({
 
         this.selectors = this.options.selectors;
         this.states = this.options.states;
-        this.overlay = zen('div' + this.selectors.overlay).top('#g-page-surround');
+        this.overlay = zen('div' + this.selectors.overlay);
         this.active = null;
         this.location = [];
 
+        var pageSurround = $('#g-page-surround');
+        if (pageSurround) {
+            this.overlay.top(pageSurround);
+        }
+
         var mainContainer = $(this.selectors.mainContainer);
         if (!mainContainer) { return; }
 
diff --git a/assets/common/js/main.js b/assets/common/js/main.js
index b24ecd7be..770f2449e 100644
--- a/assets/common/js/main.js
+++ b/assets/common/js/main.js
@@ -70,10 +70,15 @@ var Menu = new prime({
 
         this.selectors = this.options.selectors;
         this.states = this.options.states;
-        this.overlay = zen('div' + this.selectors.overlay).top('#g-page-surround');
+        this.overlay = zen('div' + this.selectors.overlay);
         this.active = null;
         this.location = [];
 
+        var pageSurround = $('#g-page-surround');
+        if (pageSurround) {
+            this.overlay.top(pageSurround);
+        }
+
         var mainContainer = $(this.selectors.mainContainer);
         if (!mainContainer) { return; }