1 files changed, 4 insertions, 1 deletions

diff --git a/shell/main.c b/shell/main.c
index 54664574c5..8ba2a9836f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -392,9 +392,12 @@ create_default_shell (void)
 	if (!express_mode)
 		express_mode = g_settings_get_boolean (settings, "express-mode");
 
-	if (express_mode)
+	if (!express_mode)
 		e_shell_detect_meego (&is_meego, &small_screen);
 
+	if (is_meego)
+		express_mode = TRUE;
+
 	if (error != NULL) {
 		g_warning ("%s", error->message);
 		g_clear_error (&error);