diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index f1d2f469c..65623bae2 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -4,6 +4,19 @@ CreOptions = {
 	prefix = 'copt',
 	default_options = {
 	},
+	{
+		icon = "resources/icons/appbar.transform.rotate.right.large.png",
+		options = {
+			{
+				name="screen_mode",
+				name_text = "Screen Mode",
+				item_text = {"portrait", "landscape"},
+				args = {"portrait", "landscape"},
+				default_arg = nil,
+				event = "SetScreenViewMode",
+			}
+		}
+	},
 	{
 		icon = "resources/icons/appbar.column.two.large.png",
 		options = {
diff --git a/frontend/document/koptinterface.lua b/frontend/document/koptinterface.lua
index 3d625debf..30617b6eb 100644
--- a/frontend/document/koptinterface.lua
+++ b/frontend/document/koptinterface.lua
@@ -26,7 +26,9 @@ KoptOptions = {
 				name="screen_mode",
 				name_text = "Screen Mode",
 				item_text = {"portrait", "landscape"},
-				-- TODO: add screen mode changing command
+				args = {"portrait", "landscape"},
+				default_arg = nil,
+				event = "SetScreenViewMode",
 			}
 		}
 	},
diff --git a/frontend/ui/reader/readerconfig.lua b/frontend/ui/reader/readerconfig.lua
index bf405fc18..c49adcf8d 100644
--- a/frontend/ui/reader/readerconfig.lua
+++ b/frontend/ui/reader/readerconfig.lua
@@ -91,15 +91,10 @@ function ReaderConfig:onShowConfigMenu()
 		end
 	end
 	
-	local dialog_container = CenterContainer:new{
-		config_dialog,
-		dimen = self.dimen:copy(),
-	}
 	config_dialog.close_callback = function () 
-		UIManager:close(menu_container)
+		UIManager:close(config_dialog)
 	end
-
-	self.dialog_container = dialog_container
+	self.config_dialog = config_dialog
 
 	UIManager:show(config_dialog)
 
@@ -116,6 +111,11 @@ function ReaderConfig:onSetDimensions(dimen)
 	self.dimen.y = 7 * Screen:getHeight() / 8
 	self.dimen.w = Screen:getWidth()
 	self.dimen.h = Screen:getHeight() / 8
+	-- since we cannot redraw config_dialog with new size, we close the old
+	-- one it on screen size change
+	if self.config_dialog then
+		self.config_dialog.close_callback()
+	end
 end
 
 function ReaderConfig:onReadSettings(config)