diff --git a/src/org/labkey/remoteapi/SimpleFormCommand.java b/src/org/labkey/remoteapi/SimpleFormCommand.java
new file mode 100644
index 0000000000..e49a74dbd0
--- /dev/null
+++ b/src/org/labkey/remoteapi/SimpleFormCommand.java
@@ -0,0 +1,43 @@
+package org.labkey.remoteapi;
+
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class SimpleFormCommand extends Command<CommandResponse, HttpUriRequest>
+{
+    private final Map<String, String> _formData;
+
+    public SimpleFormCommand(String controller, String action, Map<String, String> formData)
+    {
+        super(controller, action);
+        _formData = formData;
+    }
+
+    public CommandResponse execute(Connection connection) throws IOException, CommandException
+    {
+        return execute(connection, null);
+    }
+
+    @Override
+    protected HttpUriRequest createRequest(URI uri)
+    {
+        HttpPost post = new HttpPost(uri);
+
+        List<NameValuePair> args = new ArrayList<>();
+        for (Map.Entry<String, String> reportVal : _formData.entrySet())
+        {
+            args.add(new BasicNameValuePair(reportVal.getKey(), reportVal.getValue()));
+        }
+        post.setEntity(new UrlEncodedFormEntity(args));
+        return post;
+    }
+}
diff --git a/src/org/labkey/test/components/core/ProjectMenu.java b/src/org/labkey/test/components/core/ProjectMenu.java
index ecff1d476b..9263cce3b1 100644
--- a/src/org/labkey/test/components/core/ProjectMenu.java
+++ b/src/org/labkey/test/components/core/ProjectMenu.java
@@ -89,6 +89,8 @@ public ProjectMenu open()
             openMenu.run();
             if (!Locator.tagWithClass("div", "folder-nav").existsIn(this))
             {
+                // Menu opened but the folder list didn't load
+                close();
                 openMenu.run(); // retry
             }
         }