diff --git a/src/ui/ab.tis b/src/ui/ab.tis
index 6b073a696..3e94eaec5 100644
--- a/src/ui/ab.tis
+++ b/src/ui/ab.tis
@@ -108,7 +108,7 @@ class SessionList: Reactor.Component {
                     <li #rdp>RDP<EditRdpPort /></li>
                     <div .separator />
                     <li #rename>{translate('Rename')}</li>
-                    <li #remove>{translate('Remove')}</li>
+                    {this.type != "fav" && <li #remove>{translate('Remove')}</li>}
                     {is_win && <li #shortcut>{translate('Create Desktop Shortcut')}</li>}
                     <li #forget-password>{translate('Unremember Password')}</li>
                     {(!this.type || this.type == "fav") && <li #add-fav>{translate('Add to Favorites')}</li>}
@@ -241,7 +241,7 @@ class Favorites: Reactor.Component {
         var sessions = handler.get_fav().map(function(f) {
             return handler.get_peer(f);
         });
-        return <SessionList @{list} sessions={sessions} type="fav" />;
+        return <SessionList sessions={sessions} type="fav" />;
     }
 }
 
@@ -258,8 +258,8 @@ class MultipleSessions: Reactor.Component {
                     {!this.hidden && <SessionStyle type={type} />}
                 </div>
                 {!this.hidden && 
-                ((type == "fav" && <Favorites @{this.list} />) ||
-                <SessionList @{this.list} sessions={handler.get_recent_sessions()} />)}
+                ((type == "fav" && <Favorites />) ||
+                <SessionList sessions={handler.get_recent_sessions()} />)}
             </div>;
     }
 
@@ -278,4 +278,4 @@ class MultipleSessions: Reactor.Component {
         handler.set_option('show-sessions-type', el.id || "");
         this.stupidUpdate();
     }
-}
\ No newline at end of file
+}
diff --git a/src/ui/index.tis b/src/ui/index.tis
index 6680093ac..89b6fa063 100644
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -242,13 +242,11 @@ class App: Reactor.Component
         var is_can_screen_recording = handler.is_can_screen_recording(false);
         return
             <div .app>
-              <popup>
-              <menu.context #edit-password-context>
-                <li #refresh-password>Refresh random password</li>
-                <li #set-password>Set your own password</li>
-              </menu>
-              </popup>
-                <div .left-pane>
+                    <popup><menu.context #edit-password-context>
+                        <li #refresh-password>{translate('Refresh random password')}</li>
+                        <li #set-password>{translate('Set your own password')}</li>
+                    </menu></popup>
+                    <div .left-pane>
                     <div>
                         <div .title>{translate('Your Desktop')}</div>
                         <div .lighter-text>{translate('desk_tip')}</div>