diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index a62fc6fcf..405fa8abe 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -31,7 +31,7 @@ CalamaresWindow::CalamaresWindow( QWidget* parent )
 {
     // Hide close button
     setWindowFlags( Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint );
-    setMinimumSize( 800, 600 );
+    setMinimumSize( 1010, 600 );
 
     QBoxLayout* mainLayout = new QHBoxLayout;
     setLayout( mainLayout );
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 00f27f9dc..1b30be2d9 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -29,12 +29,17 @@ LocalePage::LocalePage( QWidget* parent )
     : QWidget()
     , m_blockTzWidgetSet( false )
 {
-    QBoxLayout *mainLayout = new QVBoxLayout;
+    QBoxLayout* mainLayout = new QVBoxLayout;
 
+    QBoxLayout* tzwLayout = new QHBoxLayout;
+    mainLayout->addLayout( tzwLayout );
     m_tzWidget = new TimeZoneWidget( this );
-    mainLayout->addWidget( m_tzWidget );
+    tzwLayout->addStretch();
+    tzwLayout->addWidget( m_tzWidget );
+    tzwLayout->addStretch();
+    setMinimumWidth( m_tzWidget->width() );
 
-    QBoxLayout *bottomLayout = new QHBoxLayout;
+    QBoxLayout* bottomLayout = new QHBoxLayout;
     mainLayout->addLayout( bottomLayout );
 
     QLabel* cityLabel = new QLabel( tr( "Region:" ), this );
@@ -137,5 +142,10 @@ LocalePage::init()
     m_timezoneCombo->blockSignals( false );
 
     m_regionCombo->currentIndexChanged( m_regionCombo->currentText() );
+
+    // Default location
+    // TODO: make configurable from module.conf
+    m_tzWidget->setCurrentLocation( "Europe", "Berlin" );
+    emit m_tzWidget->locationChanged( m_tzWidget->getCurrentLocation() );
 }