diff --git a/tests/test-back-button.js b/tests/test-back-button.js
new file mode 100644
index 000000000..39e40ea53
--- /dev/null
+++ b/tests/test-back-button.js
@@ -0,0 +1,36 @@
+"use strict";
+const test = require("tape");
+
+const setup = require("./setup");
+
+test("back button", async (t) => {
+  t.timeoutAfter(50e3);
+  setup.resetTestDataDir();
+  const app = setup.createApp();
+  try {
+    await setup.waitForLoad(app, t);
+    await app.client.windowByIndex(1); // Focus on webview
+    await (await app.client.$(".setting-input-value")).setValue(
+      "chat.zulip.org",
+    );
+    await (await app.client.$("#connect")).click();
+    await setup.wait(5000);
+    await app.client.windowByIndex(0); // Switch focus back to main win
+    await app.client.windowByIndex(1); // Switch focus back to org webview
+    await (await app.client.$("#id_username")).waitForExist();
+    await (await app.client.$("#id_username")).setValue(
+      "testzulipdesktop@gmail.com",
+    );
+    await (await app.client.$("#id_password")).setValue("testzulipdesktop");
+    await (await app.client.$(".full-width")).click();
+    await setup.wait(5000);
+    await (await app.client.$(".private_messages_header")).click();
+    await setup.wait(5000);
+    await app.client.windowByIndex(0);
+    await (await app.client.$("#back-action")).click();
+    await setup.wait(5000);
+    await setup.endTest(app, t);
+  } catch (error) {
+    await setup.endTest(app, t, error || "error");
+  }
+});