diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index c0845da7f..3076df61b 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -457,7 +457,6 @@ ChoicePage::continueApplyDeviceChoice()
     Q_EMIT deviceChosen();
 }
 
-
 void
 ChoicePage::onActionChanged()
 {
@@ -466,6 +465,15 @@ ChoicePage::onActionChanged()
     {
         applyActionChoice( m_config->installChoice() );
     }
+
+    // Whole disk encryption isn't implemented for zfs so disable the option for now
+    if ( m_eraseFsTypesChoiceComboBox != nullptr && m_enableEncryptionWidget ) {
+        if ( m_eraseFsTypesChoiceComboBox->currentText() == "zfs" ) {
+            m_encryptWidget->hide();
+        } else {
+            m_encryptWidget->show();
+        }
+    }
 }
 
 void
diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
index fe7623050..f059e90b6 100644
--- a/src/modules/partition/gui/EncryptWidget.cpp
+++ b/src/modules/partition/gui/EncryptWidget.cpp
@@ -85,6 +85,11 @@ EncryptWidget::state() const
     return m_state;
 }
 
+void EncryptWidget::setChecked(bool checked)
+{
+    m_ui->m_encryptCheckBox->setChecked(checked);
+}
+
 
 void
 EncryptWidget::setText( const QString& text )
diff --git a/src/modules/partition/gui/EncryptWidget.h b/src/modules/partition/gui/EncryptWidget.h
index 5c24d68e6..88a6c93e1 100644
--- a/src/modules/partition/gui/EncryptWidget.h
+++ b/src/modules/partition/gui/EncryptWidget.h
@@ -36,6 +36,7 @@ public:
     void reset();
 
     Encryption state() const;
+    void setChecked( bool checked );
     void setText( const QString& text );
 
     QString passphrase() const;