diff --git a/src/core/js/edit_mode.js b/src/core/js/edit_mode.js
index 6fb1c47bd6e9c4aa1beabaf5893080a82eaadd22..2b8845f7e55b86c43910b38ab1ff7a4f1a5012d9 100644
--- a/src/core/js/edit_mode.js
+++ b/src/core/js/edit_mode.js
@@ -620,7 +620,7 @@ var edit_mode = new function () {
         try {
             $(".caosdb-f-btn-toggle-edit-mode").text("Leave Edit Mode");
 
-            await edit_mode.init_tool_box();
+            edit_mode.init_tool_box();
 
             var nextEditApp = editApp;
             if (typeof nextEditApp == "undefined") {
@@ -690,6 +690,12 @@ var edit_mode = new function () {
 
         removeAllWaitingNotifications(editPanel[0]);
         editPanel.children()[0].appendChild(model);
+
+        if (edit_mode.app && edit_mode.app.entity && edit_mode.app.entity.parentElement) {
+            // an entity is being editted
+            $(".caosdb-f-edit-mode-existing").toggleClass("d-none", false);
+            $(".caosdb-f-edit-mode-create-buttons").toggleClass("d-none", true);
+        }
     }