diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 022d574c1d..019aec61ff 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -270,7 +270,10 @@ void gui_usb_screen_run(void)
         struct screen *screen = &screens[i];
 
         screen->set_viewport(NULL);
-#ifdef HAVE_LCD_BITMAP
+#ifdef HAVE_LCD_CHARCELLS
+        /* Quick fix. Viewports should really be enabled proper for charcell */
+        viewport_set_defaults(&usb_screen_vps_ar[i].parent, i);
+#else
         usb_screen_fix_viewports(screen, &usb_screen_vps_ar[i]);
 #endif
     }
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index a153a43fec..a834aa7b06 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -144,7 +144,12 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
         yn[i].result_message[YESNO_NO]=no_message;
         yn[i].display=&screens[i];
         yn[i].vp = &vp[i];
+#ifdef HAVE_LCD_CHARCELLS 
+        /* Quick fix. Viewports should really be enabled proper for charcell */
+        viewport_set_defaults(yn[i].vp, i);
+#else
         viewportmanager_theme_enable(i, true, yn[i].vp);
+#endif
         screens[i].stop_scroll();
         gui_yesno_draw(&(yn[i]));
     }