diff --git a/kolibri/plugins/device/assets/src/views/DeviceIndex.vue b/kolibri/plugins/device/assets/src/views/DeviceIndex.vue
index 6b663251d9b..d439440ee92 100644
--- a/kolibri/plugins/device/assets/src/views/DeviceIndex.vue
+++ b/kolibri/plugins/device/assets/src/views/DeviceIndex.vue
@@ -16,12 +16,7 @@
       />
     </transition>
 
-    <transition name="delay-entry">
-      <PostSetupModalGroup
-        v-if="welcomeModalVisible"
-        @cancel="hideWelcomeModal"
-      />
-    </transition>
+
 
     <router-view />
   </NotificationsRoot>
@@ -40,17 +35,14 @@
   import redirectBrowser from 'kolibri.utils.redirectBrowser';
   import urls from 'kolibri.urls';
   import { PageNames } from '../constants';
-  import PostSetupModalGroup from './PostSetupModalGroup';
+
   import PinAuthenticationModal from './PinAuthenticationModal';
   import plugin_data from 'plugin_data';
 
-  const welcomeDismissalKey = 'DEVICE_WELCOME_MODAL_DISMISSED';
-
   export default {
     name: 'DeviceIndex',
     components: {
       NotificationsRoot,
-      PostSetupModalGroup,
       PinAuthenticationModal,
     },
     mixins: [commonCoreStrings],
@@ -63,9 +55,6 @@
     computed: {
       ...mapGetters(['isUserLoggedIn', 'userFacilityId']),
       ...mapState(['authenticateWithPin', 'grantPluginAccess']),
-      ...mapState({
-        welcomeModalVisibleState: 'welcomeModalVisible',
-      }),
       facilities() {
         return this.$store.state.core.facilities;
       },
@@ -82,12 +71,6 @@
           (plugin_data.allowGuestAccess && this.$store.getters.allowAccess) || this.isUserLoggedIn
         );
       },
-      welcomeModalVisible() {
-        return (
-          this.welcomeModalVisibleState &&
-          window.localStorage.getItem(welcomeDismissalKey) !== 'true'
-        );
-      },
       pageName() {
         return this.$route.name;
       },
@@ -111,10 +94,6 @@
       },
     },
     methods: {
-      hideWelcomeModal() {
-        window.localStorage.setItem(welcomeDismissalKey, true);
-        this.$store.commit('SET_WELCOME_MODAL_VISIBLE', false);
-      },
       closePinModal() {
         redirectBrowser(urls['kolibri:kolibri.plugins.learn:learn']());
         return (this.showModal = false);
diff --git a/kolibri/plugins/device/assets/src/views/ManageContentPage/index.vue b/kolibri/plugins/device/assets/src/views/ManageContentPage/index.vue
index 492d54723ce..bac04b3e3be 100644
--- a/kolibri/plugins/device/assets/src/views/ManageContentPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/ManageContentPage/index.vue
@@ -1,6 +1,12 @@
 <template>
 
   <DeviceAppBarPage :title="pageTitle">
+    <transition name="delay<-entry">
+      <PostSetupModalGroup
+        v-if="!channelListLoading && welcomeModalVisible && !areChannelsImported"
+        @cancel="hideWelcomeModal"
+      />
+    </transition>
 
     <KPageContainer class="device-container">
 
@@ -94,11 +100,14 @@
   import { PageNames } from '../../constants';
   import HeaderWithOptions from '../HeaderWithOptions';
   import { deviceString } from '../commonDeviceStrings';
+  import PostSetupModalGroup from '../PostSetupModalGroup';
   import SelectTransferSourceModal from './SelectTransferSourceModal';
   import ChannelPanel from './ChannelPanel/WithSizeAndOptions';
   import DeleteChannelModal from './DeleteChannelModal';
   import TasksBar from './TasksBar';
 
+  const welcomeDismissalKey = 'DEVICE_WELCOME_MODAL_DISMISSED';
+
   export default {
     name: 'ManageContentPage',
     metaInfo() {
@@ -109,6 +118,7 @@
     components: {
       DeviceAppBarPage,
       ChannelPanel,
+      PostSetupModalGroup,
       DeleteChannelModal,
       HeaderWithOptions,
       SelectTransferSourceModal,
@@ -132,6 +142,9 @@
       ]),
       ...mapState('manageContent/wizard', ['pageName']),
       ...mapState('manageContent', ['channelListLoading']),
+      ...mapState({
+        welcomeModalVisibleState: 'welcomeModalVisible',
+      }),
       pageTitle() {
         return deviceString('deviceManagementTitle');
       },
@@ -166,6 +179,15 @@
           },
         ];
       },
+      welcomeModalVisible() {
+        return (
+          this.welcomeModalVisibleState &&
+          window.localStorage.getItem(welcomeDismissalKey) !== 'true'
+        );
+      },
+      areChannelsImported() {
+        return this.installedChannelsWithResources.length > 0;
+      },
     },
     watch: {
       installedChannelsWithResources: {
@@ -195,6 +217,10 @@
     },
     methods: {
       ...mapActions('manageContent', ['refreshChannelList', 'startImportWorkflow']),
+      hideWelcomeModal() {
+        window.localStorage.setItem(welcomeDismissalKey, true);
+        this.$store.commit('SET_WELCOME_MODAL_VISIBLE', false);
+      },
       handleSelect({ value }) {
         const nextRoute = {
           DELETE: PageNames.DELETE_CHANNELS,
diff --git a/kolibri/plugins/learn/assets/src/views/LearnIndex.vue b/kolibri/plugins/learn/assets/src/views/LearnIndex.vue
index 75326d801b7..9fd8c536933 100644
--- a/kolibri/plugins/learn/assets/src/views/LearnIndex.vue
+++ b/kolibri/plugins/learn/assets/src/views/LearnIndex.vue
@@ -4,13 +4,6 @@
     :authorized="userIsAuthorized"
     authorizedRole="registeredUser"
   >
-    <transition name="delay-entry">
-      <PostSetupModalGroup
-        v-if="welcomeModalVisible"
-        isOnMyOwnUser
-        @cancel="hideWelcomeModal"
-      />
-    </transition>
     <router-view :loading="loading" />
   </NotificationsRoot>
 
@@ -23,30 +16,18 @@
   import NotificationsRoot from 'kolibri.coreVue.components.NotificationsRoot';
   import plugin_data from 'plugin_data';
   import { PageNames } from '../constants';
-  import PostSetupModalGroup from '../../../../device/assets/src/views/PostSetupModalGroup.vue';
-
-  const welcomeDismissalKey = 'DEVICE_WELCOME_MODAL_DISMISSED';
 
   export default {
     name: 'LearnIndex',
     components: {
       NotificationsRoot,
-      PostSetupModalGroup,
     },
     computed: {
       ...mapGetters(['isUserLoggedIn']),
-      ...mapState({
-        welcomeModalVisibleState: 'welcomeModalVisible',
-      }),
       ...mapState({
         loading: state => state.core.loading,
       }),
-      welcomeModalVisible() {
-        return (
-          this.welcomeModalVisibleState &&
-          window.localStorage.getItem(welcomeDismissalKey) !== 'true'
-        );
-      },
+
       userIsAuthorized() {
         if (this.pageName === PageNames.BOOKMARKS) {
           return this.isUserLoggedIn;
@@ -56,12 +37,7 @@
         );
       },
     },
-    methods: {
-      hideWelcomeModal() {
-        window.localStorage.setItem(welcomeDismissalKey, true);
-        this.$store.commit('SET_WELCOME_MODAL_VISIBLE', false);
-      },
-    },
+    methods: {},
   };
 
 </script>
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
index e56a4419d02..4ea6a662651 100644
--- a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
@@ -1,144 +1,153 @@
 <template>
 
-  <LearnAppBarPage
-    :appBarTitle="appBarTitle"
-    :loading="rootNodesLoading"
-    :appearanceOverrides="{}"
-    :deviceId="deviceId"
-    :route="back"
-  >
-    <main
-      class="main-grid"
-      :style="gridOffset"
-    >
-      <div v-if="!windowIsLarge && (!isLocalLibraryEmpty || deviceId)">
-        <KButton
-          icon="filter"
-          data-test="filter-button"
-          class="filter-button"
-          :text="coreString('filter')"
-          :primary="false"
-          @click="toggleSidePanelVisibility"
-        />
-      </div>
-      <!--
-        - If search is loading, show loader.
-        - If there are no search results, show channels and resumable
-        content.
-        - Otherwise, show search results.
-      -->
-      <KCircularLoader
-        v-if="rootNodesLoading || searchLoading"
-        class="loader"
-        type="indeterminate"
-        :delay="false"
+  <div>
+    <transition name="delay-entry">
+      <PostSetupModalGroup
+        v-if="!(rootNodesLoading || searchLoading) && welcomeModalVisible && !areChannelsImported"
+        isOnMyOwnUser
+        @cancel="hideWelcomeModal"
       />
-      <div
-        v-else-if="!displayingSearchResults && !rootNodesLoading"
-        data-test="channels"
+    </transition>
+    <LearnAppBarPage
+      :appBarTitle="appBarTitle"
+      :loading="rootNodesLoading"
+      :appearanceOverrides="{}"
+      :deviceId="deviceId"
+      :route="back"
+    >
+      <main
+        class="main-grid"
+        :style="gridOffset"
       >
-        <h1 class="channels-label">
-          {{ channelsLabel }}
-        </h1>
-        <p
-          v-if="isLocalLibraryEmpty"
-          data-test="nothing-in-lib-label"
-          class="nothing-in-lib-label"
-        >
-          {{ coreString('nothingInLibraryLearner') }}
-        </p>
-        <ChannelCardGroupGrid
-          v-if="!isLocalLibraryEmpty"
-          data-test="channel-cards"
-          class="grid"
-          :contents="rootNodes"
-          :deviceId="deviceId"
+        <div v-if="!windowIsLarge && (!isLocalLibraryEmpty || deviceId)">
+          <KButton
+            icon="filter"
+            data-test="filter-button"
+            class="filter-button"
+            :text="coreString('filter')"
+            :primary="false"
+            @click="toggleSidePanelVisibility"
+          />
+        </div>
+        <!--
+          - If search is loading, show loader.
+          - If there are no search results, show channels and resumable
+          content.
+          - Otherwise, show search results.
+        -->
+        <KCircularLoader
+          v-if="rootNodesLoading || searchLoading"
+          class="loader"
+          type="indeterminate"
+          :delay="false"
         />
-        <!-- ResumableContentGrid mostly handles whether it renders or not internally !-->
-        <!-- but we conditionalize it based on whether we are on another device's library page !-->
-        <ResumableContentGrid
-          v-if="!deviceId"
-          data-test="resumable-content"
+        <div
+          v-else-if="!displayingSearchResults && !rootNodesLoading"
+          data-test="channels"
+        >
+          <h1 class="channels-label">
+            {{ channelsLabel }}
+          </h1>
+          <p
+            v-if="isLocalLibraryEmpty"
+            data-test="nothing-in-lib-label"
+            class="nothing-in-lib-label"
+          >
+            {{ coreString('nothingInLibraryLearner') }}
+          </p>
+          <ChannelCardGroupGrid
+            v-if="!isLocalLibraryEmpty"
+            data-test="channel-cards"
+            class="grid"
+            :contents="rootNodes"
+            :deviceId="deviceId"
+          />
+          <!-- ResumableContentGrid mostly handles whether it renders or not internally !-->
+          <!-- but we conditionalize it based on whether we are on another device's library page!-->
+          <ResumableContentGrid
+            v-if="!deviceId"
+            data-test="resumable-content"
+            :currentCardViewStyle="currentCardViewStyle"
+            @setCardStyle="style => currentCardViewStyle = style"
+            @setSidePanelMetadataContent="content => metadataSidePanelContent = content"
+          />
+          <!-- Other Libraries -->
+          <OtherLibraries
+            v-if="!deviceId && isUserLoggedIn"
+            data-test="other-libraries"
+            :injectedtr="injecttr"
+          />
+
+        </div>
+
+        <SearchResultsGrid
+          v-else-if="displayingSearchResults"
+          data-test="search-results"
+          :allowDownloads="allowDownloads"
+          :results="results"
+          :removeFilterTag="removeFilterTag"
+          :clearSearch="clearSearch"
+          :moreLoading="moreLoading"
+          :searchMore="searchMore"
           :currentCardViewStyle="currentCardViewStyle"
+          :searchTerms="searchTerms"
+          :searchLoading="searchLoading"
+          :more="more"
           @setCardStyle="style => currentCardViewStyle = style"
           @setSidePanelMetadataContent="content => metadataSidePanelContent = content"
         />
-        <!-- Other Libraries -->
-        <OtherLibraries
-          v-if="!deviceId && isUserLoggedIn"
-          data-test="other-libraries"
-          :injectedtr="injecttr"
-        />
-
-      </div>
-
-      <SearchResultsGrid
-        v-else-if="displayingSearchResults"
-        data-test="search-results"
-        :allowDownloads="allowDownloads"
-        :results="results"
-        :removeFilterTag="removeFilterTag"
-        :clearSearch="clearSearch"
-        :moreLoading="moreLoading"
-        :searchMore="searchMore"
-        :currentCardViewStyle="currentCardViewStyle"
-        :searchTerms="searchTerms"
-        :searchLoading="searchLoading"
-        :more="more"
-        @setCardStyle="style => currentCardViewStyle = style"
-        @setSidePanelMetadataContent="content => metadataSidePanelContent = content"
+      </main>
+
+      <!-- Side Panels for filtering and searching  -->
+      <SearchFiltersPanel
+        v-if="(!isLocalLibraryEmpty || deviceId) && (windowIsLarge || mobileSidePanelIsOpen)"
+        ref="sidePanel"
+        v-model="searchTerms"
+        data-test="side-panel"
+        :width="`${sidePanelWidth}px`"
+        @close="toggleSidePanelVisibility"
       />
-    </main>
-
-    <!-- Side Panels for filtering and searching  -->
-    <SearchFiltersPanel
-      v-if="(!isLocalLibraryEmpty || deviceId) && (windowIsLarge || mobileSidePanelIsOpen)"
-      ref="sidePanel"
-      v-model="searchTerms"
-      data-test="side-panel"
-      :width="`${sidePanelWidth}px`"
-      @close="toggleSidePanelVisibility"
-    />
-
-    <!-- Side Panel for metadata -->
-    <SidePanelModal
-      v-if="metadataSidePanelContent"
-      data-test="side-panel-modal"
-      alignment="right"
-      @closePanel="metadataSidePanelContent = null"
-      @shouldFocusFirstEl="findFirstEl()"
-    >
-      <template
-        v-if="metadataSidePanelContent.learning_activities.length"
-        #header
+
+      <!-- Side Panel for metadata -->
+      <SidePanelModal
+        v-if="metadataSidePanelContent"
+        data-test="side-panel-modal"
+        alignment="right"
+        @closePanel="metadataSidePanelContent = null"
+        @shouldFocusFirstEl="findFirstEl()"
       >
-        <!-- Flex styles tested in ie11 and look good. Ensures good spacing between
-            multiple chips - not a common thing but just in case -->
-        <div
-          v-for="activity in metadataSidePanelContent.learning_activities"
-          :key="activity"
-          class="side-panel-chips"
-          :class="$computedClass({ '::after': {
-            content: '',
-            flex: 'auto'
-          } })"
+        <template
+          v-if="metadataSidePanelContent.learning_activities.length"
+          #header
         >
-          <LearningActivityChip
-            class="chip"
-            style="margin-left: 8px; margin-bottom: 8px;"
-            :kind="activity"
-          />
-        </div>
-      </template>
-
-      <BrowseResourceMetadata
-        ref="resourcePanel"
-        :content="metadataSidePanelContent"
-        :showLocationsInChannel="true"
-        :canDownloadExternally="canDownloadExternally && !deviceId"
-      />
-    </SidePanelModal>
-  </LearnAppBarPage>
+          <!-- Flex styles tested in ie11 and look good. Ensures good spacing between
+              multiple chips - not a common thing but just in case -->
+          <div
+            v-for="activity in metadataSidePanelContent.learning_activities"
+            :key="activity"
+            class="side-panel-chips"
+            :class="$computedClass({ '::after': {
+              content: '',
+              flex: 'auto'
+            } })"
+          >
+            <LearningActivityChip
+              class="chip"
+              style="margin-left: 8px; margin-bottom: 8px;"
+              :kind="activity"
+            />
+          </div>
+        </template>
+
+        <BrowseResourceMetadata
+          ref="resourcePanel"
+          :content="metadataSidePanelContent"
+          :showLocationsInChannel="true"
+          :canDownloadExternally="canDownloadExternally && !deviceId"
+        />
+      </SidePanelModal>
+    </LearnAppBarPage>
+  </div>
 
 </template>
 
@@ -153,6 +162,7 @@
   import useUser from 'kolibri.coreVue.composables.useUser';
   import samePageCheckGenerator from 'kolibri.utils.samePageCheckGenerator';
   import { ContentNodeResource } from 'kolibri.resources';
+  import { mapState } from 'vuex';
   import SidePanelModal from '../SidePanelModal';
   import SearchFiltersPanel from '../SearchFiltersPanel';
   import { KolibriStudioId, PageNames } from '../../constants';
@@ -172,10 +182,13 @@
   import LearningActivityChip from '../LearningActivityChip';
   import SearchResultsGrid from '../SearchResultsGrid';
   import LearnAppBarPage from '../LearnAppBarPage';
+  import PostSetupModalGroup from '../../../../../device/assets/src/views/PostSetupModalGroup.vue';
   import useChannels from './../../composables/useChannels';
   import ResumableContentGrid from './ResumableContentGrid';
   import OtherLibraries from './OtherLibraries';
 
+  const welcomeDismissalKey = 'DEVICE_WELCOME_MODAL_DISMISSED';
+
   export default {
     name: 'LibraryPage',
     metaInfo() {
@@ -193,6 +206,7 @@
       SearchFiltersPanel,
       LearnAppBarPage,
       OtherLibraries,
+      PostSetupModalGroup,
     },
     mixins: [commonLearnStrings, commonCoreStrings],
     setup(props) {
@@ -388,12 +402,21 @@
       };
     },
     computed: {
+      ...mapState({
+        welcomeModalVisibleState: 'welcomeModalVisible',
+      }),
       allowDownloads() {
         return this.canAddDownloads && Boolean(this.deviceId);
       },
       appBarTitle() {
         return this.learnString(this.deviceId ? 'exploreLibraries' : 'learnLabel');
       },
+      welcomeModalVisible() {
+        return (
+          this.welcomeModalVisibleState &&
+          window.localStorage.getItem(welcomeDismissalKey) !== 'true'
+        );
+      },
       channelsLabel() {
         if (this.deviceId) {
           if (this.deviceId === this.studioId) {
@@ -428,6 +451,9 @@
       studioId() {
         return KolibriStudioId;
       },
+      areChannelsImported() {
+        return this.rootNodes.length > 0;
+      },
     },
     watch: {
       rootNodes(newNodes) {
@@ -453,6 +479,10 @@
       }
     },
     methods: {
+      hideWelcomeModal() {
+        window.localStorage.setItem(welcomeDismissalKey, true);
+        this.$store.commit('SET_WELCOME_MODAL_VISIBLE', false);
+      },
       findFirstEl() {
         this.$refs.resourcePanel.focusFirstEl();
       },