diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index 3b51f1e62..790ff84ab 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -207,6 +207,11 @@ PartitionPage::onNewPartitionTableClicked()
     Ui_CreatePartitionTableDialog ui;
     ui.setupUi( dlg.data() );
     QString areYouSure = tr( "Are you sure you want to create a new partition table on %1?" ).arg( device->name() );
+    if ( PartUtils::isEfiSystem() )
+        ui.gptRadioButton->setChecked( true );
+    else
+        ui.mbrRadioButton->setChecked( true );
+
     ui.areYouSureLabel->setText( areYouSure );
     if ( dlg->exec() == QDialog::Accepted )
     {