diff --git a/src/core/devtools/layer.cpp b/src/core/devtools/layer.cpp
index 30fc5d6c1..ccee9e9ae 100644
--- a/src/core/devtools/layer.cpp
+++ b/src/core/devtools/layer.cpp
@@ -123,12 +123,8 @@ void L::DrawMenuBar() {
             ImGui::EndMenu();
         }
         if (BeginMenu("Debug")) {
-            if (MenuItem("Memory map")) {
-                memory_map.open = true;
-            }
-            if (MenuItem("Module list")) {
-                module_list.open = true;
-            }
+            MenuItem("Memory map", nullptr, &memory_map.open);
+            MenuItem("Module list", nullptr, &module_list.open);
             ImGui::EndMenu();
         }
 
@@ -303,6 +299,18 @@ static void LoadSettings(const char* line) {
         frame_graph.is_open = i != 0;
         return;
     }
+    if (sscanf(line, "show_shader_list=%d", &i) == 1) {
+        shader_list.open = i != 0;
+        return;
+    }
+    if (sscanf(line, "show_memory_map=%d", &i) == 1) {
+        memory_map.open = i != 0;
+        return;
+    }
+    if (sscanf(line, "show_module_list=%d", &i) == 1) {
+        module_list.open = i != 0;
+        return;
+    }
     if (sscanf(line, "dump_frame_count=%d", &i) == 1) {
         dump_frame_count = i;
         return;
@@ -344,6 +352,9 @@ void L::SetupSettings() {
         buf->appendf("fps_scale=%f\n", fps_scale);
         buf->appendf("show_advanced_debug=%d\n", DebugState.IsShowingDebugMenuBar());
         buf->appendf("show_frame_graph=%d\n", frame_graph.is_open);
+        buf->appendf("show_shader_list=%d\n", shader_list.open);
+        buf->appendf("show_memory_map=%d\n", memory_map.open);
+        buf->appendf("show_module_list=%d\n", module_list.open);
         buf->appendf("dump_frame_count=%d\n", dump_frame_count);
         buf->append("\n");
         buf->appendf("[%s][CmdList]\n", handler->TypeName);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 14f580c16..e4022dfb1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -199,7 +199,7 @@ include(GoogleTest)
 foreach(t ${TEST_TARGETS})
     gtest_discover_tests(${t}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        PROPERTIES TIMEOUT 60
+        DISCOVERY_TIMEOUT 60
     )
 endforeach()
 
@@ -290,5 +290,5 @@ endif()
 
 gtest_discover_tests(shadps4_http_test
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    PROPERTIES TIMEOUT 60
+    DISCOVERY_TIMEOUT 60
 )