diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 63307d095..60becf64f 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -86,6 +86,26 @@ void
 PackageChooserPage::setModel( QAbstractItemModel* model )
 {
     ui->products->setModel( model );
+
+    // Check if any of the items in the model is the "none" option.
+    // If so, copy its values into the introduction / none item.
+    for ( int r = 0; r < model->rowCount(); ++r )
+    {
+        auto index = model->index( r, 0 );
+        if ( index.isValid() )
+        {
+            QVariant v = model->data( index, PackageListModel::IdRole );
+            if ( v.isValid() && v.toString().isEmpty() )
+            {
+                m_introduction.name = model->data( index, PackageListModel::NameRole ).toString();
+                m_introduction.description = model->data( index, PackageListModel::DescriptionRole ).toString();
+                m_introduction.screenshot = model->data( index, PackageListModel::ScreenshotRole ).value< QPixmap >();
+                currentChanged( QModelIndex() );
+                break;
+            }
+        }
+    }
+
     connect( ui->products->selectionModel(),
              &QItemSelectionModel::selectionChanged,
              this,
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 9d32884c7..8515d03a9 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -144,7 +144,7 @@ PackageChooserViewStep::onLeave()
         value = m_widget->selectedPackageIds().join( ',' );
     }
     Calamares::JobQueue::instance()->globalStorage()->insert( key, value );
-    
+
     cDebug() << "PackageChooser" << key << "selected" << value;
 }
 
@@ -180,8 +180,15 @@ PackageChooserViewStep::setConfigurationMap( const QVariantMap& configurationMap
     // TODO: replace this hard-coded model
     if ( !m_model )
     {
-
         m_model = new PackageListModel( nullptr );
+        m_model->addPackage( PackageItem { QString(),
+                                           QString(),
+                                           "No Desktop",
+                                           "Please pick a desktop environment from the list. "
+                                           "If you don't want to install a desktop, that's fine, "
+                                           "your system will start up in text-only mode and you can "
+                                           "install a desktop environment later.",
+                                           ":/images/no-selection.png" } );
         m_model->addPackage( PackageItem { "kde", "kde", "Plasma", "Plasma Desktop", ":/images/kde.png" } );
         m_model->addPackage( PackageItem {
             "gnome", "gnome", "GNOME", "GNU Networked Object Modeling Environment Desktop", ":/images/gnome.png" } );