diff --git a/src/Bookmarks/BookmarkManager.cpp b/src/Bookmarks/BookmarkManager.cpp
index 2549676..05f5393 100644
--- a/src/Bookmarks/BookmarkManager.cpp
+++ b/src/Bookmarks/BookmarkManager.cpp
@@ -17,6 +17,8 @@ void BookmarkManager::server_init_no_file() {
 void BookmarkManager::refresh_gui_data() {
     selectionData = GUIStuff::TreeListing::SelectionData();
     editing_bookmark_check();
+    oldSelection.clear();
+    editingBookmarkName = std::nullopt;
     nameToEdit.clear();
     nameForNew.clear();
 }
diff --git a/src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp b/src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp
index abc2a4b..688d897 100644
--- a/src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp
+++ b/src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp
@@ -18,6 +18,7 @@ void DrawingProgramLayerManagerGUI::refresh_gui_data() {
     oldSelection.clear();
     nameToEdit.clear();
     nameForNew.clear();
+    editingData = std::nullopt;
     alphaValToEdit = 0.0f;
     blendModeValToEdit = 0;
 }
diff --git a/src/Toolbar.cpp b/src/Toolbar.cpp
index 4dca435..d45ae68 100644
--- a/src/Toolbar.cpp
+++ b/src/Toolbar.cpp
@@ -492,16 +492,20 @@ void Toolbar::top_toolbar() {
             }
         }
         if(gui.svg_icon_button_transparent("Layer Menu Button", "data/icons/layer.svg", layerMenuPopupOpen)) {
-            if(layerMenuPopupOpen)
+            if(layerMenuPopupOpen) {
+                main.world->drawProg.layerMan.listGUI.refresh_gui_data();
                 layerMenuPopupOpen = false;
+            }
             else {
                 layerMenuPopupOpen = true;
                 layerMenuPopUpJustOpen = true;
             }
         }
         if(gui.svg_icon_button_transparent("Bookmark Menu Button", "data/icons/bookmark.svg", bookmarkMenuPopupOpen)) {
-            if(bookmarkMenuPopupOpen)
+            if(bookmarkMenuPopupOpen) {
+                main.world->bMan.refresh_gui_data();
                 bookmarkMenuPopupOpen = false;
+            }
             else {
                 bookmarkMenuPopupOpen = true;
                 bookmarkMenuPopUpJustOpen = true;