diff --git a/packages/frontend/src/components/GettingStartedSteps.vue b/packages/frontend/src/components/GettingStartedSteps.vue
index 2572fe425..178b7bf9b 100644
--- a/packages/frontend/src/components/GettingStartedSteps.vue
+++ b/packages/frontend/src/components/GettingStartedSteps.vue
@@ -313,17 +313,10 @@
         </v-btn>
       </v-card-actions>
     </v-card>
-
-    <v-dialog v-model="newStreamDialog" max-width="500">
-      <stream-new-dialog @created="finish" />
-    </v-dialog>
   </div>
 </template>
 <script>
-import StreamNewDialog from '../components/dialogs/StreamNewDialog'
-
 export default {
-  components: { StreamNewDialog },
   data: () => ({
     length: 4,
     onboarding: 0,
diff --git a/packages/frontend/src/components/dialogs/StreamEditDialog.vue b/packages/frontend/src/components/dialogs/StreamEditDialog.vue
index 430bf9196..b7b372e30 100644
--- a/packages/frontend/src/components/dialogs/StreamEditDialog.vue
+++ b/packages/frontend/src/components/dialogs/StreamEditDialog.vue
@@ -46,7 +46,7 @@
       <v-btn block x-small text color="error" @click="showDelete = true">Delete Stream</v-btn>
     </v-card-title>
     <v-card-text v-show="showDelete" class="caption py-5">
-      <h2 class="error--text py-3">Deleting Stream {{ internalName }}</h2>
+      <h2 class="error--text py-3">Deleting Stream '{{ internalName }}'</h2>
       <span class="error--text">
         Type the name of the stream below to confirm you really want to delete it.
         <b>You cannot undo this action.</b>
diff --git a/packages/frontend/src/components/dialogs/StreamNewDialog.vue b/packages/frontend/src/components/dialogs/StreamNewDialog.vue
index cef460f1d..6358f3fe6 100644
--- a/packages/frontend/src/components/dialogs/StreamNewDialog.vue
+++ b/packages/frontend/src/components/dialogs/StreamNewDialog.vue
@@ -87,7 +87,16 @@ import UserAvatar from '../UserAvatar'
 
 export default {
   components: { UserAvatar },
-  props: ['open'],
+  props: {
+    open: {
+      type: Boolean,
+      default: false
+    },
+    redirect: {
+      type: Boolean,
+      default: true
+    }
+  },
   apollo: {
     userSearch: {
       query: userSearchQuery,
@@ -183,7 +192,7 @@ export default {
           }
         }
         this.$emit('created')
-        this.$router.push({ path: `/streams/${res.data.streamCreate}` })
+        if (this.redirect) this.$router.push({ path: `/streams/${res.data.streamCreate}` })
       } catch (e) {
         console.log(e)
       }
diff --git a/packages/frontend/src/views/Streams.vue b/packages/frontend/src/views/Streams.vue
index 0c4630bfc..84fd97e94 100644
--- a/packages/frontend/src/views/Streams.vue
+++ b/packages/frontend/src/views/Streams.vue
@@ -10,7 +10,11 @@
             </v-btn>
           </v-card-actions>
           <v-dialog v-model="newStreamDialog" max-width="500">
-            <stream-new-dialog :open="newStreamDialog" />
+            <stream-new-dialog
+              :open="newStreamDialog"
+              :redirect="streams.items.length > 0"
+              @created="newStreamDialog = false"
+            />
           </v-dialog>
         </v-card>
         <div v-if="$apollo.loading" class="pa-3 mx-5 mt-5">