diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.cpp b/src/libcalamaresui/modulesystem/ProcessJobModule.cpp
index f15e5c457..74c195b6b 100644
--- a/src/libcalamaresui/modulesystem/ProcessJobModule.cpp
+++ b/src/libcalamaresui/modulesystem/ProcessJobModule.cpp
@@ -72,10 +72,13 @@ ProcessJobModule::initFrom( const QVariantMap& moduleDescriptor )
         m_command = moduleDescriptor.value( "command" ).toString();
     }
 
-    m_secondsTimeout = 30;
+    m_secondsTimeout = std::chrono::seconds( 30 );
     if ( moduleDescriptor.contains( "timeout" ) && !moduleDescriptor.value( "timeout" ).isNull() )
     {
-        m_secondsTimeout = moduleDescriptor.value( "timeout" ).toInt();
+        int sec = moduleDescriptor.value( "timeout" ).toInt();
+        if ( sec < 0 )
+            sec = 0;
+        m_secondsTimeout = std::chrono::seconds( sec );
     }
 
     m_runInChroot = false;
@@ -88,7 +91,7 @@ ProcessJobModule::initFrom( const QVariantMap& moduleDescriptor )
 
 ProcessJobModule::ProcessJobModule()
     : Module()
-    , m_secondsTimeout( 30 )
+    , m_secondsTimeout( std::chrono::seconds( 30 ) )
     , m_runInChroot( false )
 {
 }
diff --git a/src/libcalamaresui/modulesystem/ProcessJobModule.h b/src/libcalamaresui/modulesystem/ProcessJobModule.h
index 9c20aa4f4..96fb2ed47 100644
--- a/src/libcalamaresui/modulesystem/ProcessJobModule.h
+++ b/src/libcalamaresui/modulesystem/ProcessJobModule.h
@@ -24,6 +24,8 @@
 
 #include "UiDllMacro.h"
 
+#include <chrono>
+
 namespace Calamares
 {
 
@@ -46,7 +48,7 @@ private:
 
     QString m_command;
     QString m_workingPath;
-    int m_secondsTimeout;
+    std::chrono::seconds m_secondsTimeout;
     bool m_runInChroot;
     job_ptr m_job;
 };