diff --git a/src/components/Welcome.vue b/src/components/Welcome.vue
index e9823f59..6a4631f1 100644
--- a/src/components/Welcome.vue
+++ b/src/components/Welcome.vue
@@ -8,6 +8,7 @@
     <BaseOverlay
       v-show="status !== 'welcome'"
       @close="status = 'welcome'"
+      :disableClose="status === 'select_timeline'"
       :title="status === 'login'
               ? loginButton
               : status === 'public_timeline'
diff --git a/src/components/globals/BaseOverlay.vue b/src/components/globals/BaseOverlay.vue
index f039472c..a9caa0ed 100644
--- a/src/components/globals/BaseOverlay.vue
+++ b/src/components/globals/BaseOverlay.vue
@@ -1,7 +1,7 @@
 <template>
   <transition name="fade">
     <div class="overlay">
-      <button type="button" class="close-button" @click="closeOverlay">X</button>
+      <button type="button" class="close-button" @click="closeOverlay" v-show="!disableClose">X</button>
       <h1>{{ title }}</h1>
       <div class="overlay-inner">
         <slot/>
@@ -19,6 +19,8 @@ import { Component, Prop, Vue } from 'vue-property-decorator'
 export default class BaseOverlay extends Vue {
   @Prop()
   public title?: string
+  @Prop()
+  public disableClose?: boolean
 
   public closeOverlay() {
     this.$emit('close')