diff --git a/app/MainWindow.cpp b/app/MainWindow.cpp
index e316080..9ea1cf1 100644
--- a/app/MainWindow.cpp
+++ b/app/MainWindow.cpp
@@ -828,7 +828,7 @@ namespace glabels
 
 	void MainWindow::viewZoomToFit()
 	{
-		std::cout << "ACTION: edit->Zoom to fit" << std::endl;
+		view->zoomToFit();
 	}
 
 
diff --git a/app/View.cpp b/app/View.cpp
index f371a4c..b60648a 100644
--- a/app/View.cpp
+++ b/app/View.cpp
@@ -21,12 +21,15 @@
 #include "View.h"
 
 #include <cmath>
+#include <iostream>
 
 
 namespace
 {
 	const int    nZoomLevels = 14;
 	const double zoomLevels[nZoomLevels] = { 8, 6, 4, 3, 2, 1.5, 1, 0.75, 0.67, 0.50, 0.33, 0.25, 0.15, 0.10 };
+
+	const double ZOOM_TO_FIT_PAD = 16;
 }
 
 
@@ -107,6 +110,15 @@ namespace glabels
 
 	void View::zoomToFit()
 	{
+		double x_scale = (72.0/physicalDpiY()) * ( width() - ZOOM_TO_FIT_PAD ) / mModel->w();
+		double y_scale = (72.0/physicalDpiY()) * ( height() - ZOOM_TO_FIT_PAD ) / mModel->h();
+		double newZoom = min( x_scale, y_scale );
+
+		// Limits
+		newZoom = min( newZoom, zoomLevels[0] );
+		newZoom = max( newZoom, zoomLevels[nZoomLevels-1] );
+
+		setZoomReal( newZoom, true );
 	}
 
 
@@ -133,4 +145,13 @@ namespace glabels
 		emit zoomChanged();
 	}
 
+
+	void View::resizeEvent( QResizeEvent *event )
+	{
+		if ( mZoomToFitFlag )
+		{
+			zoomToFit();
+		}
+	}
+
 }
diff --git a/app/View.h b/app/View.h
index b034c92..738d2db 100644
--- a/app/View.h
+++ b/app/View.h
@@ -57,6 +57,10 @@ namespace glabels
 		void setZoomReal( double zoom, bool zoomToFitFlag );
 
 
+	protected:
+		void resizeEvent( QResizeEvent *event );
+
+
 	private:
 		QGraphicsScene*  mScene;