diff --git a/src/modules/partition/CreatePartitionDialog.cpp b/src/modules/partition/CreatePartitionDialog.cpp
index a717848f5..dc5fd8fee 100644
--- a/src/modules/partition/CreatePartitionDialog.cpp
+++ b/src/modules/partition/CreatePartitionDialog.cpp
@@ -47,8 +47,6 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, PartitionNode* par
 {
     m_ui->setupUi( this );
 
-    FileSystemFactory::init();
-
     if ( device->partitionTable()->type() == PartitionTable::msdos )
         initMbrPartitionTypeUi();
     else
diff --git a/src/modules/partition/PartitionCoreModule.cpp b/src/modules/partition/PartitionCoreModule.cpp
index 2ad439950..017a8e6b6 100644
--- a/src/modules/partition/PartitionCoreModule.cpp
+++ b/src/modules/partition/PartitionCoreModule.cpp
@@ -39,6 +39,7 @@
 #include <core/partition.h>
 #include <backend/corebackend.h>
 #include <backend/corebackendmanager.h>
+#include <fs/filesystemfactory.h>
 
 // Qt
 #include <QStandardItemModel>
@@ -90,10 +91,9 @@ PartitionCoreModule::PartitionCoreModule( QObject* parent )
     , m_deviceModel( new DeviceModel( this ) )
     , m_bootLoaderModel( new BootLoaderModel( this ) )
 {
-    // FIXME: Should be done at startup
     if ( !CalaPM::init() )
         qFatal( "Failed to init CalaPM" );
-
+    FileSystemFactory::init();
     init();
 }