diff --git a/src/core/js/edit_mode.js b/src/core/js/edit_mode.js
index 730c7961939dbe1e0647655abb741c4d3de52b70..a6880f0d00162b971d451f6843d110b39817a46f 100644
--- a/src/core/js/edit_mode.js
+++ b/src/core/js/edit_mode.js
@@ -68,8 +68,12 @@ var edit_mode = new function() {
             var target = $("#top-navbar").find("ul").first();
             this.add_edit_mode_button(target, edit_mode.toggle_edit_mode);
             if (this.is_edit_mode()) {
-                edit_mode.enter_edit_mode();
+		edit_mode.enter_edit_mode();
                 edit_mode.toggle_edit_panel();
+		// This is for the very specific case of reloading the
+		// page while the edit mode is active on small screens
+		$(".caosdb-edit-min-width-warning").removeClass("d-none");
+		$(".caosdb-edit-min-width-warning").addClass("d-block");
             }
             $('.caosdb-f-edit').css("transition", "top 1s");
         } else {
@@ -1736,10 +1740,14 @@ var edit_mode = new function() {
         //$(".caosdb-f-main").toggleClass("container-fluid").toggleClass("container");
         //$(".caosdb-f-main-entities").toggleClass("col-xs-8");
         $(".caosdb-f-edit").toggle();//.toggleClass("col-xs-4");
+	this._toggle_min_width_warning();
+    }
+
+    this._toggle_min_width_warning = function() {
         // Somewhat counter-intuitive, but when we're not in edit mode
         // and toggle the panel, we're entering and the warning should
         // be shown on small screens and vice-versa.
-        $(".caosdb-edit-min-width-warning").toggleClass("d-none", edit_mode.is_edit_mode());
+	$(".caosdb-edit-min-width-warning").toggleClass("d-none", edit_mode.is_edit_mode());
         $(".caosdb-edit-min-width-warning").toggleClass("d-block", !(edit_mode.is_edit_mode()));
     }