diff --git a/src/keyboard.rs b/src/keyboard.rs
index 8d9aedeb6..d4a51c0f3 100644
--- a/src/keyboard.rs
+++ b/src/keyboard.rs
@@ -46,6 +46,12 @@ lazy_static::lazy_static! {
     };
 }
 
+#[cfg(feature = "flutter")]
+pub fn set_cur_session(session: Session<FlutterHandler>) {
+    *CUR_SESSION.lock().unwrap() = Some(session);
+}
+
+#[cfg(not(feature = "flutter"))]
 pub fn set_cur_session(session: Session<SciterHandler>) {
     *CUR_SESSION.lock().unwrap() = Some(session);
 }
diff --git a/src/ui.rs b/src/ui.rs
index 921c137ec..e13f11d87 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -130,8 +130,9 @@ pub fn start(args: &mut [String]) {
                 pass.clone(),
                 args.clone(),
             );
-            let inner = handler.inner();
-            crate::keyboard::set_cur_session(inner);
+            #[cfg(not(feature = "flutter"))]
+            crate::keyboard::set_cur_session(handler.inner());
+            
             Box::new(handler)
         });
         page = "remote.html";