diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp
index 3760172..aba375a 100644
--- a/shared/dali-table-view.cpp
+++ b/shared/dali-table-view.cpp
@@ -287,10 +287,21 @@ void DaliTableView::Initialize( Application& application )
   ApplyCubeEffectToPages();
 
   Dali::Window winHandle = application.GetWindow();
-  winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT );
-  winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE );
-  winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
-  winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+
+  if( stageSize.width <= stageSize.height )
+  {
+    winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT );
+    winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE );
+    winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
+    winHandle.RemoveAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+  }
+  else
+  {
+    winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
+    winHandle.RemoveAvailableOrientation( Dali::Window::PORTRAIT );
+    winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+    winHandle.RemoveAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
+  }
 
   // Set initial orientation
   unsigned int degrees = 0;