diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 3e1c650..6d382a8 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -63,7 +63,15 @@ Rectangle {
         id: main
         state: "orientation " + runtime.orientation
 
-        width: parent.width; height: parent.height; anchors.centerIn: parent
+        property bool landscapeWindow: window.width > window.height 
+        property real baseWidth: landscapeWindow ? window.height : window.width
+        property real baseHeight: landscapeWindow ? window.width : window.height
+        property variant rotationDelta: landscapeWindow ? -90 : 0
+        
+        rotation: rotationDelta
+        width: main.baseWidth
+        height: main.baseHeight
+        anchors.centerIn: parent
 
         Column {
             id: box; spacing: 8
@@ -132,17 +140,17 @@ Rectangle {
         states: [
             State {
                 name: "orientation " + Orientation.Landscape
-                PropertyChanges { target: main; rotation: 90; width: window.height; height: window.width }
+                PropertyChanges { target: main; rotation: 90 + rotationDelta; width: main.baseHeight; height: main.baseWidth }
                 PropertyChanges { target: rotateButton; operation: rotateLeft }
             },
             State {
                 name: "orientation " + Orientation.PortraitInverted
-                PropertyChanges { target: main; rotation: 180; }
+                PropertyChanges { target: main; rotation: 180 + rotationDelta; }
                 PropertyChanges { target: rotateButton; operation: rotateRight }
             },
             State {
                 name: "orientation " + Orientation.LandscapeInverted
-                PropertyChanges { target: main; rotation: 270; width: window.height; height: window.width }
+                PropertyChanges { target: main; rotation: 270 + rotationDelta; width: main.baseHeight; height: main.baseWidth }
                 PropertyChanges { target: rotateButton; operation: rotateLeft }
             }
         ]