diff --git a/js/src/ajax.js b/js/src/ajax.js
index 538897aa4c3b..43980ba29542 100644
--- a/js/src/ajax.js
+++ b/js/src/ajax.js
@@ -509,6 +509,7 @@ var AJAX = {
                 // Remove all containers that may have
                 // been added outside of #page_content
                 $('body').children()
+                    .not("div.modal")
                     .not('#pma_navigation')
                     .not('#floating_menubar')
                     .not('#page_nav_icons')
diff --git a/templates/navigation/main.twig b/templates/navigation/main.twig
index 5c70cc40dbb9..b4fe7abae57b 100644
--- a/templates/navigation/main.twig
+++ b/templates/navigation/main.twig
@@ -95,4 +95,5 @@
     {% endif %}
   </div>
   {{ include('modals/unhide_nav_item.twig') }}
+  {{ include('modals/create_view.twig') }}
 {% endif %}