diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp
index 56ce023f38c..bf0c5e67e52 100644
--- a/src/app/composer/qgsatlascompositionwidget.cpp
+++ b/src/app/composer/qgsatlascompositionwidget.cpp
@@ -463,6 +463,7 @@ void QgsAtlasCompositionWidget::updateGuiElements()
   else
   {
     mAtlasMarginRadio->setChecked( true );
+    mAtlasMarginSpinBox->setEnabled( true );
   }
   mAtlasHideCoverageCheckBox->setCheckState( atlasMap->hideCoverage() ? Qt::Checked : Qt::Unchecked );
   mAtlasSingleFileCheckBox->setCheckState( atlasMap->singleFile() ? Qt::Checked : Qt::Unchecked );