diff --git a/static/js/stream_edit.js b/static/js/stream_edit.js
index 9788119782..1e87f3b051 100644
--- a/static/js/stream_edit.js
+++ b/static/js/stream_edit.js
@@ -5,10 +5,12 @@ import render_stream_member_list_entry from "../templates/stream_member_list_ent
 import render_stream_subscription_info from "../templates/stream_subscription_info.hbs";
 import render_subscription_settings from "../templates/subscription_settings.hbs";
 import render_subscription_stream_privacy_modal from "../templates/subscription_stream_privacy_modal.hbs";
+import render_unsubscribe_private_stream_modal from "../templates/unsubscribe_private_stream_modal.hbs";
 
 import * as blueslip from "./blueslip";
 import * as browser_history from "./browser_history";
 import * as channel from "./channel";
+import * as confirm_dialog from "./confirm_dialog";
 import * as hash_util from "./hash_util";
 import {i18n} from "./i18n";
 import * as input_pill from "./input_pill";
@@ -818,6 +820,24 @@ export function initialize() {
                 .removeClass("text-success");
         }
 
+        function remove_user_from_private_stream() {
+            remove_user_from_stream(target_user_id, sub, removal_success, removal_failure);
+        }
+
+        if (sub.invite_only && people.is_my_user_id(target_user_id)) {
+            const modal_parent = $("#subscriptions_table");
+            const html_body = render_unsubscribe_private_stream_modal();
+
+            confirm_dialog.launch({
+                parent: modal_parent,
+                html_heading: i18n.t("Unsubscribe from __stream_name__", {stream_name: sub.name}),
+                html_body,
+                html_yes_button: i18n.t("Yes, unsubscribe from this stream"),
+                on_click: remove_user_from_private_stream,
+            });
+            return;
+        }
+
         remove_user_from_stream(target_user_id, sub, removal_success, removal_failure);
     });
 
@@ -829,7 +849,7 @@ export function initialize() {
         const stream_row = $(
             `#subscriptions_table div.stream-row[data-stream-id='${CSS.escape(sub.stream_id)}']`,
         );
-        subs.sub_or_unsub(sub, stream_row);
+        subs.sub_or_unsub(sub, false, stream_row);
 
         if (!sub.subscribed) {
             open_edit_panel_for_row(stream_row);
diff --git a/static/js/stream_popover.js b/static/js/stream_popover.js
index 9e908d9eb3..49bc940c0a 100644
--- a/static/js/stream_popover.js
+++ b/static/js/stream_popover.js
@@ -477,7 +477,7 @@ export function register_stream_handlers() {
         $(this).closest(".popover").fadeOut(500).delay(500).remove();
 
         const sub = stream_popover_sub(e);
-        subs.sub_or_unsub(sub);
+        subs.sub_or_unsub(sub, true);
         e.preventDefault();
         e.stopPropagation();
     });
diff --git a/static/js/subs.js b/static/js/subs.js
index 37055b4fa6..7b5e3d8c38 100644
--- a/static/js/subs.js
+++ b/static/js/subs.js
@@ -5,12 +5,14 @@ import render_subscription from "../templates/subscription.hbs";
 import render_subscription_settings from "../templates/subscription_settings.hbs";
 import render_subscription_table_body from "../templates/subscription_table_body.hbs";
 import render_subscriptions from "../templates/subscriptions.hbs";
+import render_unsubscribe_private_stream_modal from "../templates/unsubscribe_private_stream_modal.hbs";
 
 import * as blueslip from "./blueslip";
 import * as browser_history from "./browser_history";
 import * as channel from "./channel";
 import * as components from "./components";
 import * as compose_state from "./compose_state";
+import * as confirm_dialog from "./confirm_dialog";
 import * as hash_util from "./hash_util";
 import {i18n} from "./i18n";
 import * as loading from "./loading";
@@ -787,7 +789,7 @@ export function keyboard_sub() {
     const active_data = get_active_data();
     const row_data = get_row_data(active_data.row);
     if (row_data) {
-        sub_or_unsub(row_data.object);
+        sub_or_unsub(row_data.object, false);
     }
 }
 
@@ -934,8 +936,41 @@ export function open_create_stream() {
     browser_history.update("#streams/new");
 }
 
-export function sub_or_unsub(sub, stream_row) {
+export function unsubscribe_from_private_stream(sub, from_stream_popover) {
+    let modal_parent = $("#subscriptions_table");
+    const html_body = render_unsubscribe_private_stream_modal();
+
+    if (from_stream_popover) {
+        modal_parent = $(".left-sidebar-modal-holder");
+    }
+
+    function unsubscribe_from_stream() {
+        let stream_row;
+        if (overlays.streams_open()) {
+            stream_row = $(
+                "#subscriptions_table div.stream-row[data-stream-id='" + sub.stream_id + "']",
+            );
+        }
+
+        ajaxUnsubscribe(sub, stream_row);
+    }
+
+    confirm_dialog.launch({
+        parent: modal_parent,
+        html_heading: i18n.t("Unsubscribe from __stream_name__", {stream_name: sub.name}),
+        html_body,
+        html_yes_button: i18n.t("Yes, unsubscribe"),
+        on_click: unsubscribe_from_stream,
+    });
+}
+
+export function sub_or_unsub(sub, from_stream_popover, stream_row) {
     if (sub.subscribed) {
+        // TODO: This next line should allow guests to access web-public streams.
+        if (sub.invite_only || page_params.is_guest) {
+            unsubscribe_from_private_stream(sub, from_stream_popover);
+            return;
+        }
         ajaxUnsubscribe(sub, stream_row);
     } else {
         ajaxSubscribe(sub.name, sub.color, stream_row);
diff --git a/static/templates/unsubscribe_private_stream_modal.hbs b/static/templates/unsubscribe_private_stream_modal.hbs
new file mode 100644
index 0000000000..7c36508142
--- /dev/null
+++ b/static/templates/unsubscribe_private_stream_modal.hbs
@@ -0,0 +1 @@
+<p>{{t "Once you leave a private stream, you will not be able to rejoin." }}</p>