diff --git a/conf/dlggeneralbase.ui b/conf/dlggeneralbase.ui
index 319d77622..df4b1a0e8 100644
--- a/conf/dlggeneralbase.ui
+++ b/conf/dlggeneralbase.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>320</width>
-    <height>378</height>
+    <width>558</width>
+    <height>575</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -243,6 +243,48 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="toolTip">
+         <string>Defines the default zoom mode for files which were never opened before.
+For files which were opened before the previous zoom is applied.</string>
+        </property>
+        <property name="whatsThis">
+         <string comment="@info:whatsthis">Defines the default zoom mode for files which were never opened before.
+For files which were opened before the previous zoom is applied.</string>
+        </property>
+        <property name="text">
+         <string>Default Zoom:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QComboBox" name="kcfg_ZoomMode">
+        <property name="toolTip">
+         <string>Defines the default zoom mode for files which were never opened before.
+For files which were opened before the previous zoom is applied.</string>
+        </property>
+        <property name="whatsThis">
+         <string comment="@info:whatsthis">Defines the default zoom mode for files which were never opened before.
+For files which were opened before the previous zoom is applied.</string>
+        </property>
+        <item>
+         <property name="text">
+          <string>100%</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Fit Width</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Fit Page</string>
+         </property>
+        </item>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/conf/okular.kcfg b/conf/okular.kcfg
index 9ea25c2b2..b7d511c99 100644
--- a/conf/okular.kcfg
+++ b/conf/okular.kcfg
@@ -253,7 +253,7 @@
    </choices>
   </entry>
   <entry key="ZoomMode" type="UInt" >
-    <default>2</default>
+    <default>1</default>
     <max>2</max>
   </entry>
   <entry key="ZoomFactor" type="Double" >
diff --git a/doc/index.docbook b/doc/index.docbook
index f0f4dcca6..ee38de8bd 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1372,6 +1372,16 @@ Add a 'Find Previous' entry
 						</para>
 					</listitem>
 				</varlistentry>
+				<varlistentry>
+					<term><guilabel>Default Zoom</guilabel></term>
+					<listitem>
+						<para>
+							This options specifies the default zoom mode for file which were never
+							opened before. For which which were opened before the previous zoom mode
+							is applied.
+						</para>
+					</listitem>
+				</varlistentry>
 			</variablelist>
 		</sect1>
 		<sect1 id="configaccessibility">
diff --git a/ui/pageview.cpp b/ui/pageview.cpp
index 568f9a37a..5c9d99f03 100644
--- a/ui/pageview.cpp
+++ b/ui/pageview.cpp
@@ -284,6 +284,27 @@ PageView::PageView( QWidget *parent, Okular::Document *document )
     d->aPageSizes=0;
     d->setting_viewCols = Okular::Settings::viewColumns();
 
+    int initialZoom = Okular::Settings::zoomMode();
+    switch( initialZoom )
+    {
+        case 0:
+        {
+            d->zoomFactor = 1;
+            d->zoomMode = PageView::ZoomFixed;
+            break;
+        }
+        case 1:
+        {
+            d->zoomMode = PageView::ZoomFitWidth;
+            break;
+        }
+        case 2:
+        {
+            d->zoomMode = PageView::ZoomFitPage;
+            break;
+        }
+    }
+
     d->delayResizeEventTimer = new QTimer( this );
     d->delayResizeEventTimer->setSingleShot( true );
     connect( d->delayResizeEventTimer, SIGNAL(timeout()), this, SLOT(delayedResizeEvent()) );