diff --git a/test/nbrowser/ActionLog.ts b/test/nbrowser/ActionLog.ts
index 49459ea4..cb37e20c 100644
--- a/test/nbrowser/ActionLog.ts
+++ b/test/nbrowser/ActionLog.ts
@@ -29,6 +29,13 @@ describe('ActionLog', function() {
     await gu.dismissWelcomeTourIfNeeded();
   });
 
+  after(async function() {
+    // If were are debugging the browser won't be reloaded, so we need to close the right panel.
+    if (process.env.NO_CLEANUP) {
+      await driver.find(".test-right-tool-close").click();
+    }
+  });
+
   it("should cross out undone actions", async function() {
     // Open the action-log tab.
     await driver.findWait('.test-tools-log', 1000).click();
diff --git a/test/nbrowser/CustomView.ts b/test/nbrowser/CustomView.ts
index 0c8dfe9e..f9fa7dac 100644
--- a/test/nbrowser/CustomView.ts
+++ b/test/nbrowser/CustomView.ts
@@ -268,6 +268,8 @@ describe('CustomView', function() {
     const mainSession = await gu.session().teamSite.login();
     await mainSession.tempDoc(cleanup, 'TypeEncoding.grist');
     await gu.toggleSidePanel('right', 'open');
+    await driver.find('.test-right-tab-pagewidget').click();
+    await gu.waitForServer();
     await driver.find('.test-config-data').click();
 
     // The test doc already has a Custom View widget. It just needs to
diff --git a/test/nbrowser/CustomWidgets.ts b/test/nbrowser/CustomWidgets.ts
index 23bfd084..6563a2de 100644
--- a/test/nbrowser/CustomWidgets.ts
+++ b/test/nbrowser/CustomWidgets.ts
@@ -188,7 +188,9 @@ describe('CustomWidgets', function () {
   const reject = () => driver.find(".test-config-widget-access-reject").click();
 
   it('should show widgets in dropdown', async () => {
-    await gu.toggleSidePanel('right');
+    await gu.toggleSidePanel('right', 'open');
+    await driver.find('.test-right-tab-pagewidget').click();
+    await gu.waitForServer();
     await driver.find('.test-config-widget').click();
     await gu.waitForServer(); // Wait for widgets to load.