diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
index 69cc31a79e25d..c21fc1063c7ee 100644
--- a/data/raw/keybindings.json
+++ b/data/raw/keybindings.json
@@ -1192,6 +1192,13 @@
     "name": "Toggle forest trails",
     "bindings": [ { "input_method": "keyboard_char", "key": "T" }, { "input_method": "keyboard_code", "key": "t", "mod": [ "shift" ] } ]
   },
+  {
+    "type": "keybinding",
+    "id": "TOGGLE_FAST_TRAVEL",
+    "category": "OVERMAP",
+    "name": "Toggle fast travel",
+    "bindings": [ { "input_method": "keyboard_char", "key": "x" }, { "input_method": "keyboard_code", "key": "x", "mod": [ "shift" ] } ]
+  },
   {
     "type": "keybinding",
     "id": "TOGGLE_EXPLORED",
diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp
index 3a17adce7afba..fd0d68eccbcba 100644
--- a/src/activity_actor.cpp
+++ b/src/activity_actor.cpp
@@ -653,6 +653,7 @@ void autodrive_activity_actor::canceled( player_activity &act, Character &who )
     if( player_vehicle ) {
         player_vehicle->stop_autodriving( false );
     }
+    ui::omap::force_quit();
     act.set_to_null();
 }
 
@@ -660,6 +661,7 @@ void autodrive_activity_actor::finish( player_activity &act, Character &who )
 {
     who.add_msg_if_player( m_info, _( "You have reached your destination." ) );
     player_vehicle->stop_autodriving( false );
+    ui::omap::force_quit();
     act.set_to_null();
 }
 
diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp
index d36eae2fcce3b..989825905925d 100644
--- a/src/activity_handlers.cpp
+++ b/src/activity_handlers.cpp
@@ -2903,6 +2903,7 @@ void activity_handlers::travel_do_turn( player_activity *act, Character *you )
         if( you->omt_path.empty() ) {
             you->add_msg_if_player( m_info, _( "You have reached your destination." ) );
             act->set_to_null();
+            ui::omap::force_quit();
             return;
         }
         const tripoint_abs_omt next_omt = you->omt_path.back();
@@ -2938,6 +2939,7 @@ void activity_handlers::travel_do_turn( player_activity *act, Character *you )
         }
     } else {
         you->add_msg_if_player( m_info, _( "You have reached your destination." ) );
+        ui::omap::force_quit();
     }
     act->set_to_null();
 }
diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
index cb5fe22a79fbb..36d3aaab7cd98 100644
--- a/src/avatar_action.cpp
+++ b/src/avatar_action.cpp
@@ -362,7 +362,7 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d )
             if( you.is_auto_moving() ) {
                 add_msg( m_warning, _( "Monster in the way.  Auto move canceled." ) );
                 add_msg( m_info, _( "Move into the monster to attack." ) );
-                you.clear_destination();
+                you.abort_automove();
                 return false;
             }
             if( !you.try_break_relax_gas( _( "Your willpower asserts itself, and so do you!" ),
@@ -406,7 +406,7 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d )
         if( you.is_auto_moving() ) {
             add_msg( _( "NPC in the way, Auto move canceled." ) );
             add_msg( m_info, _( "Move into the NPC to interact or attack." ) );
-            you.clear_destination();
+            you.abort_automove();
             return false;
         }
 
@@ -460,7 +460,7 @@ bool avatar_action::move( avatar &you, map &m, const tripoint &d )
     if( is_riding ) {
         if( !you.check_mount_will_move( dest_loc.raw() ) ) {
             if( you.is_auto_moving() ) {
-                you.clear_destination();
+                you.abort_automove();
             }
             you.mod_moves( -you.get_speed() * 0.2 );
             return false;
diff --git a/src/character.cpp b/src/character.cpp
index 5874fa68e092f..7cb09f5b11340 100644
--- a/src/character.cpp
+++ b/src/character.cpp
@@ -1836,7 +1836,7 @@ void Character::forced_dismount()
         set_movement_mode( move_mode_walk );
         if( player_character.is_auto_moving() || player_character.has_destination() ||
             player_character.has_destination_activity() ) {
-            player_character.clear_destination();
+            player_character.abort_automove();
         }
         g->update_map( player_character );
     }
@@ -11292,6 +11292,14 @@ void Character::clear_destination()
     next_expected_position = std::nullopt;
 }
 
+void Character::abort_automove()
+{
+    clear_destination();
+    if( g->overmap_data.fast_traveling && is_avatar() ) {
+        ui::omap::force_quit();
+    }
+}
+
 bool Character::has_distant_destination() const
 {
     return has_destination() && !get_destination_activity().is_null() &&
diff --git a/src/character.h b/src/character.h
index 872b0afab8319..d9d5c2225abfc 100644
--- a/src/character.h
+++ b/src/character.h
@@ -3766,6 +3766,8 @@ class Character : public Creature, public visitable
         void set_destination( const std::vector<tripoint_bub_ms> &route,
                               const player_activity &new_destination_activity = player_activity() );
         void clear_destination();
+        //clear_destination(), also closes overmap UI if still open
+        void abort_automove();
         bool has_distant_destination() const;
 
         // true if the player is auto moving, or if the player is going to finish
diff --git a/src/game.cpp b/src/game.cpp
index 82af9c1a5ade3..95c12cce52389 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1466,7 +1466,7 @@ static bool cancel_auto_move( Character &you, const std::string &text )
     g->invalidate_main_ui_adaptor();
     if( query_yn( _( "%s Cancel auto move?" ), text ) )  {
         add_msg( m_warning, _( "%s Auto move canceled." ), text );
-        you.clear_destination();
+        you.abort_automove();
         return true;
     }
     return false;
@@ -1602,7 +1602,7 @@ bool game::cancel_activity_query( const std::string &text )
             }
         }
         u.cancel_activity();
-        u.clear_destination();
+        u.abort_automove();
         u.resume_backlog_activity();
         return true;
     }
diff --git a/src/game.h b/src/game.h
index 92244afa65774..9e240418fa405 100644
--- a/src/game.h
+++ b/src/game.h
@@ -29,6 +29,7 @@
 #include "global_vars.h"
 #include "item_location.h"
 #include "memory_fast.h"
+#include "overmap_ui.h"
 #include "pimpl.h"
 #include "point.h"
 #include "type_id.h"
@@ -1138,6 +1139,9 @@ class game
         catacurses::window w_pixel_minimap; // NOLINT(cata-serialize)
         //only a pointer, can refer to w_messages_short or w_messages_long
 
+        //overmap UI singleton
+        overmap_ui::overmap_draw_data_t overmap_data; // NOLINT(cata-serialize)
+
         // View offset based on the driving speed (if any)
         // that has been added to u.view_offset,
         // Don't write to this directly, always use set_driving_view_offset
diff --git a/src/handle_action.cpp b/src/handle_action.cpp
index 7700143f03d87..270fd74b2219b 100644
--- a/src/handle_action.cpp
+++ b/src/handle_action.cpp
@@ -2257,13 +2257,13 @@ bool game::do_regular_action( action_id &act, avatar &player_character,
                     act = player_character.get_next_auto_move_direction();
                     const point dest_next = get_delta_from_movement_action( act, iso_rotate::yes );
                     if( dest_next == point_zero ) {
-                        player_character.clear_destination();
+                        player_character.abort_automove();
                     }
                     dest_delta = dest_next;
                 }
                 if( !avatar_action::move( player_character, m, dest_delta ) ) {
                     // auto-move should be canceled due to a failed move or obstacle
-                    player_character.clear_destination();
+                    player_character.abort_automove();
                 }
 
                 if( get_option<bool>( "AUTO_FEATURES" ) && get_option<bool>( "AUTO_MOPPING" ) &&
@@ -3002,7 +3002,7 @@ bool game::handle_action()
         act = player_character.get_next_auto_move_direction();
         if( act == ACTION_NULL ) {
             add_msg( m_info, _( "Auto-move canceled" ) );
-            player_character.clear_destination();
+            player_character.abort_automove();
             return false;
         }
         handle_key_blocking_activity();
diff --git a/src/overmap_ui.cpp b/src/overmap_ui.cpp
index 931f6258acb15..eb2327e9f8e30 100644
--- a/src/overmap_ui.cpp
+++ b/src/overmap_ui.cpp
@@ -18,7 +18,6 @@
 
 #include "activity_actor_definitions.h"
 #include "all_enum_values.h"
-#include "avatar.h"
 #include "basecamp.h"
 #include "calendar.h"
 #include "enum_conversions.h"
@@ -74,6 +73,7 @@
 
 class character_id;
 
+static const activity_id ACT_AUTODRIVE( "ACT_AUTODRIVE" );
 static const activity_id ACT_TRAVELLING( "ACT_TRAVELLING" );
 
 static const mongroup_id GROUP_FOREST( "GROUP_FOREST" );
@@ -540,11 +540,12 @@ static bool get_and_assign_los( int &los, avatar &player_character, const tripoi
 }
 
 static void draw_ascii(
-    const catacurses::window &w, const tripoint_abs_omt &center,
-    const tripoint_abs_omt &orig, bool blink, bool show_explored, bool /* fast_scroll */,
-    input_context * /* inp_ctxt */, const draw_data_t &data,
-    const std::vector<tripoint_abs_omt> &display_path )
+    const catacurses::window &w, overmap_draw_data_t &data )
 {
+    const tripoint_abs_omt &orig = data.origin_pos;
+    const tripoint_abs_omt &cursor_pos = data.cursor_pos;
+    const std::vector<tripoint_abs_omt> &display_path = data.display_path;
+    bool blink = uistate.overmap_show_overlays;
 
     const int om_map_width = OVERMAP_WINDOW_WIDTH;
     const int om_map_height = OVERMAP_WINDOW_HEIGHT;
@@ -565,14 +566,13 @@ static void draw_ascii(
 
     oter_display_lru lru_cache;
     oter_display_options oter_opts( orig, sight_points );
-    oter_opts.blink = blink;
     oter_opts.show_weather = ( uistate.overmap_debug_weather || uistate.overmap_visible_weather ) &&
-                             center.z() == 10;
+                             cursor_pos.z() == 10;
     oter_opts.show_pc = true;
     oter_opts.debug_scent = data.debug_scent;
     oter_opts.show_map_revealed = uistate.overmap_show_revealed_omts;
     oter_opts.showhordes = uistate.overmap_show_hordes;
-    oter_opts.show_explored = show_explored;
+    oter_opts.show_explored = data.show_explored;
 
     std::string &sZoneName = oter_opts.sZoneName;
     tripoint_abs_omt &tripointZone = oter_opts.tripointZone;
@@ -580,6 +580,14 @@ static void draw_ascii(
 
     oter_opts.mission_target = target;
 
+    if( data.fast_traveling ) {
+        tripoint_abs_omt &next_path = player_character.omt_path.back();
+        data.cursor_pos = next_path;
+        oter_opts.center = next_path;
+        blink = true;
+    }
+    oter_opts.blink = blink;
+
     if( data.iZoneIndex != -1 ) {
         const zone_data &zone = zones.get_zones()[data.iZoneIndex].get();
         sZoneName = zone.get_name();
@@ -592,7 +600,7 @@ static void draw_ascii(
     const mongroup *mgroup = nullptr;
     std::vector<mongroup *> mgroups;
     if( uistate.overmap_debug_mongroup ) {
-        mgroups = overmap_buffer.monsters_at( center );
+        mgroups = overmap_buffer.monsters_at( cursor_pos );
         for( mongroup * const &mgp : mgroups ) {
             mgroup = mgp;
             if( mgp->horde ) {
@@ -601,7 +609,7 @@ static void draw_ascii(
         }
     }
 
-    const tripoint_abs_omt corner = center - point( om_half_width, om_half_height );
+    const tripoint_abs_omt corner = cursor_pos - point( om_half_width, om_half_height );
 
     // For use with place_special: cache the color and symbol of each submap
     // and record the bounds to optimize lookups below
@@ -637,7 +645,7 @@ static void draw_ascii(
     if( blink ) {
         // get seen NPCs
         for( const auto &np : npcs_near_player ) {
-            if( np->posz() != center.z() ) {
+            if( np->posz() != cursor_pos.z() ) {
                 continue;
             }
 
@@ -689,7 +697,7 @@ static void draw_ascii(
             player_path_route[ elem.xy() ] = elem.z();
         }
         for( npc * const &np : followers ) {
-            if( np->posz() != center.z() ) {
+            if( np->posz() != cursor_pos.z() ) {
                 continue;
             }
             const tripoint_abs_omt pos = np->global_omt_location();
@@ -768,11 +776,11 @@ static void draw_ascii(
 
             // Preview for place_terrain or place_special
             if( uistate.place_terrain || uistate.place_special ) {
-                if( blink && uistate.place_terrain && omp.xy() == center.xy() ) {
+                if( blink && uistate.place_terrain && omp.xy() == cursor_pos.xy() ) {
                     ter_color = uistate.place_terrain->get_color( om_vision_level::full );
                     ter_sym = uistate.place_terrain->get_symbol( om_vision_level::full );
                 } else if( blink && uistate.place_special ) {
-                    const point_rel_omt from_center = omp.xy() - center.xy();
+                    const point_rel_omt from_center = omp.xy() - cursor_pos.xy();
                     if( from_center.x() >= s_begin.x() && from_center.x() <= s_end.x() &&
                         from_center.y() >= s_begin.y() && from_center.y() <= s_end.y() ) {
                         const auto sm = special_cache.find( from_center );
@@ -789,7 +797,7 @@ static void draw_ascii(
                 }
             }
 
-            if( omp.xy() == center.xy() && !uistate.place_special ) {
+            if( omp.xy() == cursor_pos.xy() && !uistate.place_special ) {
                 ccur_ter = cur_ter;
                 mvwputch_hi( w, point( i, j ), ter_color, ter_sym );
             } else {
@@ -798,9 +806,9 @@ static void draw_ascii(
         }
     }
 
-    if( center.z() == 0 && uistate.overmap_show_city_labels ) {
-        draw_city_labels( w, center );
-        draw_camp_labels( w, center );
+    if( cursor_pos.z() == 0 && uistate.overmap_show_city_labels ) {
+        draw_city_labels( w, cursor_pos );
+        draw_camp_labels( w, cursor_pos );
     }
 
     half_open_rectangle<point_abs_omt> screen_bounds(
@@ -810,7 +818,7 @@ static void draw_ascii(
         point_rel_omt marker = clamp( target.xy(), screen_bounds ) - corner.xy();
         std::string marker_sym = " ";
 
-        switch( direction_from( center.xy(), target.xy() ) ) {
+        switch( direction_from( cursor_pos.xy(), target.xy() ) ) {
             case direction::NORTH:
                 marker_sym = "^";
                 break;
@@ -844,7 +852,7 @@ static void draw_ascii(
     std::vector<std::pair<nc_color, std::string>> corner_text;
 
     if( uistate.overmap_show_map_notes ) {
-        const std::string &note_text = overmap_buffer.note( center );
+        const std::string &note_text = overmap_buffer.note( cursor_pos );
         if( !note_text.empty() ) {
             const std::tuple<char, nc_color, size_t> note_info = get_note_display_info(
                         note_text );
@@ -852,21 +860,21 @@ static void draw_ascii(
             if( pos != std::string::npos ) {
                 corner_text.emplace_back( std::get<1>( note_info ), note_text.substr( pos ) );
             }
-            if( overmap_buffer.is_marked_dangerous( center ) ) {
+            if( overmap_buffer.is_marked_dangerous( cursor_pos ) ) {
                 corner_text.emplace_back( c_red, _( "DANGEROUS AREA!" ) );
             }
         }
     }
 
-    if( has_debug_vision || overmap_buffer.seen_more_than( center, om_vision_level::details ) ) {
+    if( has_debug_vision || overmap_buffer.seen_more_than( cursor_pos, om_vision_level::details ) ) {
         for( const auto &npc : npcs_near_player ) {
-            if( !npc->marked_for_death && npc->global_omt_location() == center ) {
+            if( !npc->marked_for_death && npc->global_omt_location() == cursor_pos ) {
                 corner_text.emplace_back( npc->basic_symbol_color(), npc->get_name() );
             }
         }
     }
 
-    for( om_vehicle &v : overmap_buffer.get_vehicle( center ) ) {
+    for( om_vehicle &v : overmap_buffer.get_vehicle( cursor_pos ) ) {
         corner_text.emplace_back( c_white, v.name );
     }
 
@@ -899,7 +907,7 @@ static void draw_ascii(
         mvwputch( w, point( maxlen + 2, corner_text.size() + 2 ), c_white, LINE_XOOX );
     }
 
-    if( !sZoneName.empty() && tripointZone.xy() == center.xy() ) {
+    if( !sZoneName.empty() && tripointZone.xy() == cursor_pos.xy() ) {
         std::string sTemp = _( "Zone:" );
         sTemp += " " + sZoneName;
 
@@ -924,11 +932,12 @@ static void draw_ascii(
     wnoutrefresh( w );
 }
 
-static void draw_om_sidebar(
-    ui_adaptor &ui, const catacurses::window &wbar, const tripoint_abs_omt &center,
-    const tripoint_abs_omt &orig, bool /* blink */, bool fast_scroll,
-    input_context *inp_ctxt, const draw_data_t &data )
+static void draw_om_sidebar( ui_adaptor &ui,
+                             const catacurses::window &wbar, const input_context &inp_ctxt, const overmap_draw_data_t &data )
 {
+    const tripoint_abs_omt &orig = data.origin_pos;
+    const tripoint_abs_omt &cursor_pos = data.cursor_pos;
+
     avatar &player_character = get_avatar();
     // Debug vision allows seeing everything
     const bool has_debug_vision = player_character.has_trait( trait_DEBUG_NIGHTVISION );
@@ -937,7 +946,7 @@ static void draw_om_sidebar(
                              player_character.overmap_modified_sight_range( g->light_level( player_character.posz() ) ) :
                              100;
     om_vision_level center_vision = has_debug_vision ? om_vision_level::full :
-                                    overmap_buffer.seen( center );
+                                    overmap_buffer.seen( cursor_pos );
     const tripoint_abs_omt target = player_character.get_active_mission_target();
     const bool has_target = target != overmap::invalid_tripoint;
     const bool viewing_weather = uistate.overmap_debug_weather || uistate.overmap_visible_weather;
@@ -945,7 +954,7 @@ static void draw_om_sidebar(
     // If we're debugging monster groups, find the monster group we've selected
     std::vector<mongroup *> mgroups;
     if( uistate.overmap_debug_mongroup ) {
-        mgroups = overmap_buffer.monsters_at( center );
+        mgroups = overmap_buffer.monsters_at( cursor_pos );
         for( mongroup * const &mgp : mgroups ) {
             if( mgp->horde ) {
                 break;
@@ -988,11 +997,11 @@ static void draw_om_sidebar(
                            c_red, "x" );
             }
         } else {
-            const oter_t &ter = overmap_buffer.ter( center ).obj();
-            const auto sm_pos = project_to<coords::sm>( center );
+            const oter_t &ter = overmap_buffer.ter( cursor_pos ).obj();
+            const auto sm_pos = project_to<coords::sm>( cursor_pos );
 
             if( ter.blends_adjacent( center_vision ) ) {
-                oter_vision::blended_omt info = oter_vision::get_blended_omt_info( center, center_vision );
+                oter_vision::blended_omt info = oter_vision::get_blended_omt_info( cursor_pos, center_vision );
                 // NOLINTNEXTLINE(cata-use-named-point-constants)
                 mvwputch( wbar, point( 1, 1 ), info.color, info.sym );
             } else {
@@ -1041,11 +1050,11 @@ static void draw_om_sidebar(
     // Describe the weather conditions on the following line, if weather is visible
     if( viewing_weather ) {
         const bool weather_is_visible = uistate.overmap_debug_weather ||
-                                        player_character.overmap_los( center, sight_points * 2 );
+                                        player_character.overmap_los( cursor_pos, sight_points * 2 );
         if( weather_is_visible ) {
             // NOLINTNEXTLINE(cata-use-named-point-constants)
-            mvwprintz( wbar, point( 3, ++lines ), get_weather_at_point( center )->color,
-                       get_weather_at_point( center )->name.translated() );
+            mvwprintz( wbar, point( 3, ++lines ), get_weather_at_point( cursor_pos )->color,
+                       get_weather_at_point( cursor_pos )->name.translated() );
         } else {
             // NOLINTNEXTLINE(cata-use-named-point-constants)
             mvwprintz( wbar, point( 1, ++lines ), c_dark_gray, _( "# Weather unknown" ) );
@@ -1054,8 +1063,8 @@ static void draw_om_sidebar(
 
     if( ( data.debug_editor && center_vision != om_vision_level::unseen ) || data.debug_info ) {
         mvwprintz( wbar, point( 1, ++lines ), c_white,
-                   "abs_omt: %s", center.to_string() );
-        const oter_t &oter = overmap_buffer.ter( center ).obj();
+                   "abs_omt: %s", cursor_pos.to_string() );
+        const oter_t &oter = overmap_buffer.ter( cursor_pos ).obj();
         mvwprintz( wbar, point( 1, ++lines ), c_white, "oter: %s (rot %d)", oter.id.str(),
                    oter.get_rotation() );
         mvwprintz( wbar, point( 1, ++lines ), c_white,
@@ -1063,14 +1072,14 @@ static void draw_om_sidebar(
         // tileset ids come with a prefix that must be stripped
         mvwprintz( wbar, point( 1, ++lines ), c_white,
                    "tileset id: '%s'", oter.get_tileset_id( center_vision ).substr( 3 ) );
-        std::vector<oter_id> predecessors = overmap_buffer.predecessors( center );
+        std::vector<oter_id> predecessors = overmap_buffer.predecessors( cursor_pos );
         if( !predecessors.empty() ) {
             mvwprintz( wbar, point( 1, ++lines ), c_white, "predecessors:" );
             for( auto pred = predecessors.rbegin(); pred != predecessors.rend(); ++pred ) {
                 mvwprintz( wbar, point( 1, ++lines ), c_white, "- %s", pred->id().str() );
             }
         }
-        std::optional<mapgen_arguments> *args = overmap_buffer.mapgen_args( center );
+        std::optional<mapgen_arguments> *args = overmap_buffer.mapgen_args( cursor_pos );
         if( args ) {
             if( *args ) {
                 for( const std::pair<const std::string, cata_variant> &arg : ( **args ).map ) {
@@ -1083,13 +1092,13 @@ static void draw_om_sidebar(
         }
 
         for( cube_direction dir : all_enum_values<cube_direction>() ) {
-            if( std::string *join = overmap_buffer.join_used_at( { center, dir } ) ) {
+            if( std::string *join = overmap_buffer.join_used_at( { cursor_pos, dir } ) ) {
                 mvwprintz( wbar, point( 1, ++lines ), c_white, "join %s: %s",
                            io::enum_to_string( dir ), *join );
             }
         }
 
-        for( const mongroup *mg : overmap_buffer.monsters_at( center ) ) {
+        for( const mongroup *mg : overmap_buffer.monsters_at( cursor_pos ) ) {
             mvwprintz( wbar, point( 1, ++lines ), c_red, "mongroup %s (%zu/%u), %s %s%s",
                        mg->type.str(), mg->monsters.size(), mg->population,
                        io::enum_to_string( mg->behaviour ),
@@ -1100,7 +1109,7 @@ static void draw_om_sidebar(
     }
 
     if( has_target ) {
-        const int distance = rl_dist( center, target );
+        const int distance = rl_dist( cursor_pos, target );
         mvwprintz( wbar, point( 1, ++lines ), c_white, _( "Distance to current objective:" ) );
         mvwprintz( wbar, point( 1, ++lines ), c_white, _( "%d tiles" ), distance );
         // One OMT is 24 tiles across, at 1x1 meters each, so we can simply do number of OMTs * 24
@@ -1121,7 +1130,7 @@ static void draw_om_sidebar(
 
     //Show mission targets on this location
     for( mission *&mission : player_character.get_active_missions() ) {
-        if( mission->get_target() == center ) {
+        if( mission->get_target() == cursor_pos ) {
             mvwprintz( wbar, point( 1, ++lines ), c_white, mission->name() );
         }
     }
@@ -1129,55 +1138,54 @@ static void draw_om_sidebar(
     mvwprintz( wbar, point( 1, 12 ), c_magenta, _( "Use movement keys to pan." ) );
     mvwprintz( wbar, point( 1, 13 ), c_magenta, _( "Press W to preview route." ) );
     mvwprintz( wbar, point( 1, 14 ), c_magenta, _( "Press again to confirm." ) );
-    if( inp_ctxt != nullptr ) {
-        int y = 16;
+    int y = 16;
 
-        const auto print_hint = [&]( const std::string & action, nc_color color = c_magenta ) {
-            y += fold_and_print( wbar, point( 1, y ), getmaxx( wbar ) - 1, color, string_format( _( "%s - %s" ),
-                                 inp_ctxt->get_desc( action ),
-                                 inp_ctxt->get_action_name( action ) ) );
-        };
+    const auto print_hint = [&]( const std::string & action, nc_color color = c_magenta ) {
+        y += fold_and_print( wbar, point( 1, y ), getmaxx( wbar ) - 1, color, string_format( _( "%s - %s" ),
+                             inp_ctxt.get_desc( action ),
+                             inp_ctxt.get_action_name( action ) ) );
+    };
 
-        if( data.debug_editor ) {
-            print_hint( "PLACE_TERRAIN", c_light_blue );
-            print_hint( "PLACE_SPECIAL", c_light_blue );
-            print_hint( "SET_SPECIAL_ARGS", c_light_blue );
-            print_hint( "LONG_TELEPORT", c_light_blue );
-            ++y;
-        }
-
-        const bool show_overlays = uistate.overmap_show_overlays || uistate.overmap_blinking;
-        const bool is_explored = overmap_buffer.is_explored( center );
-
-        print_hint( "LEVEL_UP" );
-        print_hint( "LEVEL_DOWN" );
-        print_hint( "CENTER" );
-        print_hint( "CENTER_ON_DESTINATION" );
-        print_hint( "GO_TO_DESTINATION" );
-        print_hint( "SEARCH" );
-        print_hint( "CREATE_NOTE" );
-        print_hint( "DELETE_NOTE" );
-        print_hint( "MARK_DANGER" );
-        print_hint( "LIST_NOTES" );
-        print_hint( "MISSIONS" );
-        print_hint( "TOGGLE_MAP_NOTES", uistate.overmap_show_map_notes ? c_pink : c_magenta );
-        print_hint( "TOGGLE_BLINKING", uistate.overmap_blinking ? c_pink : c_magenta );
-        print_hint( "TOGGLE_OVERLAYS", show_overlays ? c_pink : c_magenta );
-        print_hint( "TOGGLE_LAND_USE_CODES", uistate.overmap_show_land_use_codes ? c_pink : c_magenta );
-        print_hint( "TOGGLE_CITY_LABELS", uistate.overmap_show_city_labels ? c_pink : c_magenta );
-        print_hint( "TOGGLE_HORDES", uistate.overmap_show_hordes ? c_pink : c_magenta );
-        print_hint( "TOGGLE_MAP_REVEALS", uistate.overmap_show_revealed_omts ? c_pink : c_magenta );
-        print_hint( "TOGGLE_EXPLORED", is_explored ? c_pink : c_magenta );
-        print_hint( "TOGGLE_FAST_SCROLL", fast_scroll ? c_pink : c_magenta );
-        print_hint( "TOGGLE_FOREST_TRAILS", uistate.overmap_show_forest_trails ? c_pink : c_magenta );
-        print_hint( "TOGGLE_OVERMAP_WEATHER",
-                    !get_map().is_outside( get_player_character().pos_bub() ) ? c_dark_gray :
-                    uistate.overmap_visible_weather ? c_pink : c_magenta );
-        print_hint( "HELP_KEYBINDINGS" );
-        print_hint( "QUIT" );
-    }
-
-    const std::string coords = display::overmap_position_text( center );
+    if( data.debug_editor ) {
+        print_hint( "PLACE_TERRAIN", c_light_blue );
+        print_hint( "PLACE_SPECIAL", c_light_blue );
+        print_hint( "SET_SPECIAL_ARGS", c_light_blue );
+        print_hint( "LONG_TELEPORT", c_light_blue );
+        ++y;
+    }
+
+    const bool show_overlays = uistate.overmap_show_overlays || uistate.overmap_blinking;
+    const bool is_explored = overmap_buffer.is_explored( cursor_pos );
+
+    print_hint( "LEVEL_UP" );
+    print_hint( "LEVEL_DOWN" );
+    print_hint( "CENTER" );
+    print_hint( "CENTER_ON_DESTINATION" );
+    print_hint( "GO_TO_DESTINATION" );
+    print_hint( "SEARCH" );
+    print_hint( "CREATE_NOTE" );
+    print_hint( "DELETE_NOTE" );
+    print_hint( "MARK_DANGER" );
+    print_hint( "LIST_NOTES" );
+    print_hint( "MISSIONS" );
+    print_hint( "TOGGLE_MAP_NOTES", uistate.overmap_show_map_notes ? c_pink : c_magenta );
+    print_hint( "TOGGLE_BLINKING", uistate.overmap_blinking ? c_pink : c_magenta );
+    print_hint( "TOGGLE_OVERLAYS", show_overlays ? c_pink : c_magenta );
+    print_hint( "TOGGLE_LAND_USE_CODES", uistate.overmap_show_land_use_codes ? c_pink : c_magenta );
+    print_hint( "TOGGLE_CITY_LABELS", uistate.overmap_show_city_labels ? c_pink : c_magenta );
+    print_hint( "TOGGLE_HORDES", uistate.overmap_show_hordes ? c_pink : c_magenta );
+    print_hint( "TOGGLE_MAP_REVEALS", uistate.overmap_show_revealed_omts ? c_pink : c_magenta );
+    print_hint( "TOGGLE_EXPLORED", is_explored ? c_pink : c_magenta );
+    print_hint( "TOGGLE_FAST_SCROLL", uistate.overmap_fast_scroll ? c_pink : c_magenta );
+    print_hint( "TOGGLE_FOREST_TRAILS", uistate.overmap_show_forest_trails ? c_pink : c_magenta );
+    print_hint( "TOGGLE_FAST_TRAVEL", uistate.overmap_fast_travel ? c_pink : c_magenta );
+    print_hint( "TOGGLE_OVERMAP_WEATHER",
+                !get_map().is_outside( get_player_character().pos_bub() ) ? c_dark_gray :
+                uistate.overmap_visible_weather ? c_pink : c_magenta );
+    print_hint( "HELP_KEYBINDINGS" );
+    print_hint( "QUIT" );
+
+    const std::string coords = display::overmap_position_text( cursor_pos );
     mvwprintz( wbar, point( 1, getmaxy( wbar ) - 1 ), c_red, coords );
     wnoutrefresh( wbar );
 }
@@ -1186,24 +1194,23 @@ static void draw_om_sidebar(
 tiles_redraw_info redraw_info;
 #endif
 
-static void draw(
-    ui_adaptor &ui, const tripoint_abs_omt &center, const tripoint_abs_omt &orig,
-    bool blink, bool show_explored, bool fast_scroll,
-    input_context *inp_ctxt, const draw_data_t &data,
-    const std::vector<tripoint_abs_omt> &display_path )
+static void draw( overmap_draw_data_t &data )
 {
-    draw_om_sidebar( ui, g->w_omlegend, center, orig, blink, fast_scroll, inp_ctxt, data );
+    ui_adaptor *ui = data.ui.get();
+    if( ui == nullptr ) {
+        return;
+    }
+    draw_om_sidebar( *ui, g->w_omlegend, data.ictxt, data );
 #if defined( TILES )
     if( use_tiles && use_tiles_overmap ) {
-        redraw_info = tiles_redraw_info { center, blink };
+        redraw_info = tiles_redraw_info { data.cursor_pos, uistate.overmap_show_overlays };
         werase( g->w_overmap );
         // trigger the actual redraw code in sdltiles.cpp
         wnoutrefresh( g->w_overmap );
         return;
     }
 #endif // TILES
-    draw_ascii( g->w_overmap, center, orig, blink, show_explored, fast_scroll, inp_ctxt, data,
-                display_path );
+    draw_ascii( g->w_overmap, data );
 }
 
 static void create_note( const tripoint_abs_omt &curs )
@@ -1713,9 +1720,14 @@ static bool try_travel_to_destination( avatar &player_character, const tripoint_
     return false;
 }
 
-static tripoint_abs_omt display( const tripoint_abs_omt &orig,
-                                 const draw_data_t &data = draw_data_t(), std::vector<tripoint_abs_omt> display_path = {} )
+static tripoint_abs_omt display()
 {
+    overmap_draw_data_t &data = g->overmap_data;
+    tripoint_abs_omt &orig = data.origin_pos;
+    std::vector<tripoint_abs_omt> &display_path = data.display_path;
+    tripoint_abs_omt &select = data.select;
+    input_context &ictxt = data.ictxt;
+
     const int previous_zoom = g->get_zoom();
     g->set_zoom( overmap_zoom_level );
     on_out_of_scope reset_zoom( [&]() {
@@ -1726,8 +1738,10 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
 
     background_pane bg_pane;
 
-    ui_adaptor ui;
-    ui.on_screen_resize( []( ui_adaptor & ui ) {
+    data.ui = std::make_shared<ui_adaptor>();
+    std::shared_ptr<ui_adaptor> ui = data.ui;
+
+    ui->on_screen_resize( []( ui_adaptor & ui ) {
         /**
          * Handle possibly different overmap font size
          */
@@ -1745,16 +1759,16 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
 
         ui.position_from_window( catacurses::stdscr );
     } );
-    ui.mark_resize();
+    ui->mark_resize();
 
     tripoint_abs_omt ret = overmap::invalid_tripoint;
-    tripoint_abs_omt curs( orig );
+    data.cursor_pos = data.origin_pos;
+    tripoint_abs_omt &curs = data.cursor_pos;
 
-    if( data.select != tripoint_abs_omt( -1, -1, -1 ) ) {
-        curs = data.select;
+    if( select != tripoint_abs_omt( -1, -1, -1 ) ) {
+        curs = select;
     }
     // Configure input context for navigating the map.
-    input_context ictxt( "OVERMAP" );
     ictxt.register_action( "ANY_INPUT" );
     ictxt.register_directions();
     ictxt.register_action( "CONFIRM" );
@@ -1787,6 +1801,7 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
     ictxt.register_action( "TOGGLE_FAST_SCROLL" );
     ictxt.register_action( "TOGGLE_OVERMAP_WEATHER" );
     ictxt.register_action( "TOGGLE_FOREST_TRAILS" );
+    ictxt.register_action( "TOGGLE_FAST_TRAVEL" );
     ictxt.register_action( "MISSIONS" );
 
     if( data.debug_editor ) {
@@ -1797,18 +1812,18 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
     }
     ictxt.register_action( "QUIT" );
     std::string action;
-    bool show_explored = true;
-    static bool fast_scroll = false;
+    data.show_explored = true;
     int fast_scroll_offset = get_option<int>( "FAST_SCROLL_OFFSET" );
     std::optional<tripoint> mouse_pos;
     std::chrono::time_point<std::chrono::steady_clock> last_blink = std::chrono::steady_clock::now();
     std::chrono::time_point<std::chrono::steady_clock> last_advance = std::chrono::steady_clock::now();
     auto display_path_iter = display_path.rbegin();
     std::chrono::milliseconds cursor_advance_time = std::chrono::milliseconds( 0 );
+    bool keep_overmap_ui = false;
 
-    ui.on_redraw( [&]( ui_adaptor & ui ) {
-        draw( ui, curs, orig, uistate.overmap_show_overlays,
-              show_explored, fast_scroll, &ictxt, data, display_path );
+    ui->on_redraw( [&]( ui_adaptor & ui ) {
+        ( void )ui;
+        draw( g->overmap_data );
     } );
 
     do {
@@ -1841,7 +1856,7 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
             }
         }
         if( const std::optional<tripoint> vec = ictxt.get_direction( action ) ) {
-            int scroll_d = fast_scroll ? fast_scroll_offset : 1;
+            int scroll_d = uistate.overmap_fast_scroll ? fast_scroll_offset : 1;
             curs += vec->xy() * scroll_d;
         } else if( action == "MOUSE_MOVE" || action == "TIMEOUT" ) {
             tripoint edge_scroll = g->mouse_edge_scrolling_overmap( ictxt );
@@ -1862,10 +1877,10 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
             curs.z() += 1;
         } else if( action == "zoom_out" ) {
             g->zoom_out_overmap();
-            ui.mark_resize();
+            ui->mark_resize();
         } else  if( action == "zoom_in" ) {
             g->zoom_in_overmap();
-            ui.mark_resize();
+            ui->mark_resize();
         } else if( action == "CONFIRM" ) {
             ret = curs;
         } else if( action == "QUIT" ) {
@@ -1917,6 +1932,9 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
                 const bool driving = player_character.in_vehicle && player_character.controlling_vehicle;
                 if( try_travel_to_destination( player_character, player_character.omt_path.front(), driving ) ) {
                     action = "QUIT";
+                    if( uistate.overmap_fast_travel ) {
+                        keep_overmap_ui = true;
+                    }
                 }
             }
         } else if( action == "CENTER_ON_DESTINATION" ) {
@@ -1939,6 +1957,9 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
             if( same_path_selected && !player_character.omt_path.empty() ) {
                 if( try_travel_to_destination( player_character, curs, driving ) ) {
                     action = "QUIT";
+                    if( uistate.overmap_fast_travel ) {
+                        keep_overmap_ui = true;
+                    }
                 }
             }
         } else if( action == "TOGGLE_BLINKING" ) {
@@ -1947,17 +1968,17 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
             if( !uistate.overmap_blinking ) {
                 uistate.overmap_show_overlays = true;
             } else {
-                show_explored = true;
+                data.show_explored = true;
             }
         } else if( action == "TOGGLE_OVERLAYS" ) {
             // if we are currently blinking, turn blinking off.
             if( uistate.overmap_blinking ) {
                 uistate.overmap_blinking = false;
                 uistate.overmap_show_overlays = false;
-                show_explored = false;
+                data.show_explored = false;
             } else {
                 uistate.overmap_show_overlays = !uistate.overmap_show_overlays;
-                show_explored = !show_explored;
+                data.show_explored = !data.show_explored;
             }
         } else if( action == "TOGGLE_LAND_USE_CODES" ) {
             uistate.overmap_show_land_use_codes = !uistate.overmap_show_land_use_codes;
@@ -1976,15 +1997,17 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
                 uistate.overmap_visible_weather = !uistate.overmap_visible_weather;
             }
         } else if( action == "TOGGLE_FAST_SCROLL" ) {
-            fast_scroll = !fast_scroll;
+            uistate.overmap_fast_scroll = !uistate.overmap_fast_scroll;
         } else if( action == "TOGGLE_FOREST_TRAILS" ) {
             uistate.overmap_show_forest_trails = !uistate.overmap_show_forest_trails;
+        } else if( action == "TOGGLE_FAST_TRAVEL" ) {
+            uistate.overmap_fast_travel = !uistate.overmap_fast_travel;
         } else if( action == "SEARCH" ) {
-            if( !search( ui, curs, orig ) ) {
+            if( !search( *ui, curs, orig ) ) {
                 continue;
             }
         } else if( action == "PLACE_TERRAIN" || action == "PLACE_SPECIAL" ) {
-            place_ter_or_special( ui, curs, action );
+            place_ter_or_special( *ui, curs, action );
         } else if( action == "SET_SPECIAL_ARGS" ) {
             set_special_args( curs );
         } else if( action == "LONG_TELEPORT" && curs != overmap::invalid_tripoint ) {
@@ -2003,6 +2026,11 @@ static tripoint_abs_omt display( const tripoint_abs_omt &orig,
             last_blink = now;
         }
     } while( action != "QUIT" && action != "CONFIRM" );
+    if( !keep_overmap_ui ) {
+        ui::omap::force_quit();
+    } else {
+        data.fast_traveling = true;
+    }
     return ret;
 }
 
@@ -2125,8 +2153,9 @@ std::pair<std::string, nc_color> oter_symbol_and_color( const tripoint_abs_omt &
     oter_id cur_ter = oter_str_id::NULL_ID();
     avatar &player_character = get_avatar();
     std::vector<point_abs_omt> plist;
+    const bool blink = opts.blink || g->overmap_data.fast_traveling;
 
-    if( opts.blink && !opts.mission_inbounds && opts.mission_target ) {
+    if( blink && !opts.mission_inbounds && opts.mission_target ) {
         plist = line_to( opts.center.xy(), opts.mission_target->xy() );
     }
 
@@ -2135,7 +2164,7 @@ std::pair<std::string, nc_color> oter_symbol_and_color( const tripoint_abs_omt &
         cur_ter = overmap_buffer.ter( omp );
     }
 
-    if( opts.blink && opts.show_pc && !opts.hilite_pc && omp == opts.center ) {
+    if( blink && opts.show_pc && !opts.hilite_pc && omp == opts.center ) {
         // Display player pos, should always be visible
         ret.second = player_character.symbol_color();
         ret.first = "@";
@@ -2146,10 +2175,10 @@ std::pair<std::string, nc_color> oter_symbol_and_color( const tripoint_abs_omt &
         ret.first = type->get_symbol();
     } else if( opts.debug_scent && overmap_ui::get_scent_glyph( omp, ret.second, ret.first ) ) {
         // get_scent_glyph has changed ret.second and ret.first if omp has a scent
-    } else if( opts.blink && overmap_buffer.is_marked_dangerous( omp ) ) {
+    } else if( blink && overmap_buffer.is_marked_dangerous( omp ) ) {
         ret.second = c_red;
         ret.first = "X";
-    } else if( opts.blink && opts.mission_inbounds && opts.mission_target && !opts.hilite_mission &&
+    } else if( blink && opts.mission_inbounds && opts.mission_target && !opts.hilite_mission &&
                omp.xy() == opts.mission_target->xy() ) {
         // Mission target, display always, player should know where it is anyway.
         ret.second = c_red;
@@ -2164,7 +2193,7 @@ std::pair<std::string, nc_color> oter_symbol_and_color( const tripoint_abs_omt &
         ret.first = "*";
         ret.second = c_red;
         opts.drawn_mission = true;
-    } else if( opts.blink && uistate.overmap_show_map_notes && overmap_buffer.has_note( omp ) ) {
+    } else if( blink && uistate.overmap_show_map_notes && overmap_buffer.has_note( omp ) ) {
         // Display notes in all situations, even when not seen
         std::tie( ret.first, ret.second,
                   std::ignore ) = overmap_ui::get_note_display_info( overmap_buffer.note( omp ) );
@@ -2173,11 +2202,11 @@ std::pair<std::string, nc_color> oter_symbol_and_color( const tripoint_abs_omt &
         ret.second = oter_unexplored.obj().get_color( om_vision_level::full );
         ret.first = oter_unexplored.obj().get_symbol( om_vision_level::full );
         // All cases below assume that see is true.
-    } else if( opts.blink && opts.npc_color.count( omp ) != 0 ) {
+    } else if( blink && opts.npc_color.count( omp ) != 0 ) {
         // Visible NPCs are cached already
         ret.second = opts.npc_color.at( omp ).color;
         ret.first = "@";
-    } else if( opts.blink && opts.player_path_route.find( omp.xy() ) != opts.player_path_route.end() ) {
+    } else if( blink && opts.player_path_route.find( omp.xy() ) != opts.player_path_route.end() ) {
         // player path
         ret.second = c_blue;
         const int player_path_z = opts.player_path_route.at( omp.xy() );
@@ -2188,16 +2217,16 @@ std::pair<std::string, nc_color> oter_symbol_and_color( const tripoint_abs_omt &
         } else {
             ret.first = "v";
         }
-    } else if( opts.blink && opts.npc_path_route.find( omp ) != opts.npc_path_route.end() ) {
+    } else if( blink && opts.npc_path_route.find( omp ) != opts.npc_path_route.end() ) {
         // npc path
         ret.second = c_red;
         ret.first = "!";
-    } else if( opts.blink && opts.show_map_revealed &&
+    } else if( blink && opts.show_map_revealed &&
                player_character.map_revealed_omts.find( omp ) != player_character.map_revealed_omts.end() ) {
         // Revealed map tiles
         ret.second = c_magenta;
         ret.first = "&";
-    } else if( opts.blink && opts.showhordes &&
+    } else if( blink && opts.showhordes &&
                overmap_buffer.get_horde_size( omp ) >= HORDE_VISIBILITY_SIZE &&
                args.vision > om_vision_level::details &&
                ( overmap_ui::get_and_assign_los( args.los, player_character, omp, opts.sight_points ) ||
@@ -2205,7 +2234,7 @@ std::pair<std::string, nc_color> oter_symbol_and_color( const tripoint_abs_omt &
         // Display Hordes only when within player line-of-sight
         ret.second = c_green;
         ret.first = overmap_buffer.get_horde_size( omp ) > HORDE_VISIBILITY_SIZE * 2 ? "Z" : "z";
-    } else if( opts.blink && overmap_buffer.has_vehicle( omp ) ) {
+    } else if( blink && overmap_buffer.has_vehicle( omp ) ) {
         ret.second = c_cyan;
         ret.first = overmap_buffer.get_vehicle_ter_sym( omp );
     } else if( !opts.sZoneName.empty() && opts.tripointZone.xy() == omp.xy() ) {
@@ -2250,87 +2279,101 @@ std::pair<std::string, nc_color> oter_symbol_and_color( const tripoint_abs_omt &
 
 void ui::omap::display()
 {
-    overmap_ui::display( get_player_character().global_omt_location(), overmap_ui::draw_data_t() );
+    g->overmap_data = overmap_ui::overmap_draw_data_t(); //reset data
+    g->overmap_data.origin_pos = get_player_character().global_omt_location();
+    overmap_ui::display();
 }
 
 void ui::omap::display_npc_path( tripoint_abs_omt starting_pos,
                                  const std::vector<tripoint_abs_omt> &display_path )
 {
-    overmap_ui::display( starting_pos, overmap_ui::draw_data_t(), display_path );
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
+    g->overmap_data.origin_pos = starting_pos;
+    g->overmap_data.display_path = display_path;
+    overmap_ui::display();
 }
 
 void ui::omap::display_hordes()
 {
-    overmap_ui::draw_data_t data;
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
+    g->overmap_data.origin_pos = get_player_character().global_omt_location();
     uistate.overmap_debug_mongroup = true;
-    overmap_ui::display( get_player_character().global_omt_location(), data );
+    overmap_ui::display();
     uistate.overmap_debug_mongroup = false;
 }
 
 void ui::omap::display_weather()
 {
-    overmap_ui::draw_data_t data;
-    uistate.overmap_debug_weather = true;
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
     tripoint_abs_omt pos = get_player_character().global_omt_location();
     pos.z() = 10;
-    overmap_ui::display( pos, data );
+    g->overmap_data.origin_pos = pos;
+    uistate.overmap_debug_weather = true;
+    overmap_ui::display();
     uistate.overmap_debug_weather = false;
 }
 
 void ui::omap::display_visible_weather()
 {
-    overmap_ui::draw_data_t data;
-    uistate.overmap_visible_weather = true;
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
     tripoint_abs_omt pos = get_player_character().global_omt_location();
     pos.z() = 10;
-    overmap_ui::display( pos, data );
+    g->overmap_data.origin_pos = pos;
+    uistate.overmap_visible_weather = true;
+    overmap_ui::display();
     uistate.overmap_visible_weather = false;
 }
 
 void ui::omap::display_scents()
 {
-    overmap_ui::draw_data_t data;
-    data.debug_scent = true;
-    overmap_ui::display( get_player_character().global_omt_location(), data );
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
+    g->overmap_data.origin_pos = get_player_character().global_omt_location();
+    g->overmap_data.debug_scent = true;
+    overmap_ui::display();
 }
 
 void ui::omap::display_editor()
 {
-    overmap_ui::draw_data_t data;
-    data.debug_editor = true;
-    overmap_ui::display( get_player_character().global_omt_location(), data );
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
+    g->overmap_data.origin_pos = get_player_character().global_omt_location();
+    g->overmap_data.debug_editor = true;
+    overmap_ui::display();
 }
 
 void ui::omap::display_zones( const tripoint_abs_omt &center, const tripoint_abs_omt &select,
                               const int iZoneIndex )
 {
-    overmap_ui::draw_data_t data;
-    data.select = select;
-    data.iZoneIndex = iZoneIndex;
-    overmap_ui::display( center, data );
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
+    g->overmap_data.origin_pos = center;
+    g->overmap_data.select = select;
+    g->overmap_data.iZoneIndex = iZoneIndex;
+    overmap_ui::display();
 }
 
 tripoint_abs_omt ui::omap::choose_point( bool show_debug_info )
 {
-    overmap_ui::draw_data_t data;
-    data.debug_info = show_debug_info;
-    return overmap_ui::display( get_player_character().global_omt_location(), data );
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
+    g->overmap_data.origin_pos = get_player_character().global_omt_location();
+    g->overmap_data.debug_info = show_debug_info;
+    return overmap_ui::display();
 }
 
 tripoint_abs_omt ui::omap::choose_point( const tripoint_abs_omt &origin, bool show_debug_info )
 {
-    overmap_ui::draw_data_t data;
-    data.debug_info = show_debug_info;
-    return overmap_ui::display( origin, data );
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
+    g->overmap_data.origin_pos = origin;
+    g->overmap_data.debug_info = show_debug_info;
+    return overmap_ui::display();
 }
 
 tripoint_abs_omt ui::omap::choose_point( int z, bool show_debug_info )
 {
-    overmap_ui::draw_data_t data;
-    data.debug_info = show_debug_info;
-    tripoint_abs_omt loc = get_player_character().global_omt_location();
-    loc.z() = z;
-    return overmap_ui::display( loc, data );
+    g->overmap_data = overmap_ui::overmap_draw_data_t();
+    g->overmap_data.debug_info = show_debug_info;
+    tripoint_abs_omt pos = get_player_character().global_omt_location();
+    pos.z() = z;
+    g->overmap_data.origin_pos = pos;
+    return overmap_ui::display();
 }
 
 void ui::omap::setup_cities_menu( uilist &cities_menu, std::vector<city> &cities_container )
@@ -2377,3 +2420,9 @@ std::optional<city> ui::omap::select_city( uilist &cities_menu,
     }
     return ret_val;
 }
+
+void ui::omap::force_quit()
+{
+    g->overmap_data.ui.reset();
+    g->overmap_data.fast_traveling = false;
+}
diff --git a/src/overmap_ui.h b/src/overmap_ui.h
index 15633bd7563bd..5c35ccfa688a5 100644
--- a/src/overmap_ui.h
+++ b/src/overmap_ui.h
@@ -2,9 +2,12 @@
 #ifndef CATA_SRC_OVERMAP_UI_H
 #define CATA_SRC_OVERMAP_UI_H
 
+#include "avatar.h"
 #include "coords_fwd.h"
+#include "input_context.h"
 #include "regional_settings.h"
 #include "string_id.h"
+#include "ui_manager.h"
 
 constexpr int RANDOM_CITY_ENTRY = INT_MIN;
 
@@ -88,6 +91,7 @@ void setup_cities_menu( uilist &cities_menu, std::vector<city> &cities_container
 std::optional<city> select_city( uilist &cities_menu, std::vector<city> &cities_container,
                                  bool random = false );
 
+void force_quit();
 } // namespace omap
 
 } // namespace ui
@@ -95,16 +99,34 @@ std::optional<city> select_city( uilist &cities_menu, std::vector<city> &cities_
 namespace overmap_ui
 {
 // drawing relevant data, e.g. what to draw.
-struct draw_data_t {
+struct overmap_draw_data_t {
     // draw editor.
     bool debug_editor = false;
     // draw scent traces.
     bool debug_scent = false;
     // draw debug info.
     bool debug_info = false;
+    // darken explored tiles
+    bool show_explored = true;
+    // currently fast traveling
+    bool fast_traveling = false;
+
     // draw zone location.
     tripoint_abs_omt select = tripoint_abs_omt( -1, -1, -1 );
     int iZoneIndex = -1;
+    std::vector<tripoint_abs_omt> display_path = {};
+    //center of UI view; usually player OMT position
+    tripoint_abs_omt origin_pos = tripoint_abs_omt( -1, -1, -1 );
+    //UI view cursor position
+    tripoint_abs_omt cursor_pos = tripoint_abs_omt( -1, -1, -1 );
+    //the UI adaptor for the overmap; this can keep the overmap displayed while turns are processed
+    std::shared_ptr<ui_adaptor> ui;
+    input_context ictxt;
+
+    overmap_draw_data_t() {
+        ui = std::make_shared<ui_adaptor>();
+        ictxt = input_context( "OVERMAP" );
+    }
 };
 
 #if defined(TILES)
@@ -117,5 +139,6 @@ extern tiles_redraw_info redraw_info;
 
 weather_type_id get_weather_at_point( const tripoint_abs_omt &pos );
 std::tuple<char, nc_color, size_t> get_note_display_info( std::string_view note );
+
 } // namespace overmap_ui
 #endif // CATA_SRC_OVERMAP_UI_H
diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
index 34cc14549eace..db5b41d145e38 100644
--- a/src/sdltiles.cpp
+++ b/src/sdltiles.cpp
@@ -787,7 +787,12 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
     int height_3d = 0;
     avatar &you = get_avatar();
     const tripoint_abs_omt avatar_pos = you.global_omt_location();
-    const tripoint_abs_omt origin = center_abs_omt - point( s.x / 2, s.y / 2 );
+    tripoint_abs_omt center_pos = tripoint_abs_omt( center_abs_omt );
+    const bool fast_traveling = g->overmap_data.fast_traveling;
+    if( fast_traveling ) {
+        center_pos = you.global_omt_location();
+    }
+    const tripoint_abs_omt origin = center_pos - point( s.x / 2, s.y / 2 );
     const tripoint_abs_omt corner_NW = origin + any_tile_range.p_min;
     const tripoint_abs_omt corner_SE = origin + any_tile_range.p_max + point_north_west;
     const inclusive_cuboid<tripoint> overmap_area( corner_NW.raw(), corner_SE.raw() );
@@ -805,6 +810,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
     const bool show_map_revealed = uistate.overmap_show_revealed_omts;
     std::unordered_set<tripoint_abs_omt> &revealed_highlights = get_avatar().map_revealed_omts;
     const bool viewing_weather = uistate.overmap_debug_weather || uistate.overmap_visible_weather;
+    const bool draw_overlays = blink || fast_traveling;
     o = origin.raw().xy();
 
     const auto global_omt_to_draw_position = []( const tripoint_abs_omt & omp ) {
@@ -857,7 +863,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
                                      0, 0, ll, false );
             }
 
-            if( blink && show_map_revealed ) {
+            if( draw_overlays && show_map_revealed ) {
                 auto it = revealed_highlights.find( omp );
                 if( it != revealed_highlights.end() ) {
                     draw_from_id_string( "highlight", omp.raw(), 0, 0, lit_level::LIT, false );
@@ -865,7 +871,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
             }
 
             if( vision != om_vision_level::unseen ) {
-                if( blink && uistate.overmap_debug_mongroup ) {
+                if( draw_overlays && uistate.overmap_debug_mongroup ) {
                     const std::vector<mongroup *> mgroups = overmap_buffer.monsters_at( omp );
                     if( !mgroups.empty() ) {
                         auto mgroup_iter = mgroups.begin();
@@ -919,7 +925,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
                 }
             }
 
-            if( blink && overmap_buffer.has_vehicle( omp ) ) {
+            if( draw_overlays && overmap_buffer.has_vehicle( omp ) ) {
                 const std::string tile_id = overmap_buffer.get_vehicle_tile_id( omp );
                 if( find_tile_looks_like( tile_id, TILE_CATEGORY::OVERMAP_NOTE, "" ) ) {
                     draw_from_id_string( tile_id, TILE_CATEGORY::OVERMAP_NOTE,
@@ -932,7 +938,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
                 }
             }
 
-            if( blink && uistate.overmap_show_map_notes ) {
+            if( draw_overlays && uistate.overmap_show_map_notes ) {
                 if( overmap_buffer.has_note( omp ) ) {
                     nc_color ter_color = c_black;
                     std::string ter_sym = " ";
@@ -959,7 +965,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
         int rotation;
         int subtile;
         terrain.get_rotation_and_subtile( rotation, subtile );
-        draw_from_id_string( id, global_omt_to_draw_position( center_abs_omt ), subtile, rotation,
+        draw_from_id_string( id, global_omt_to_draw_position( center_pos ), subtile, rotation,
                              lit_level::LOW, true );
     }
     if( uistate.place_special ) {
@@ -975,7 +981,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
                 terrain.get_rotation_and_subtile( rotation, subtile );
 
                 draw_from_id_string( id, TILE_CATEGORY::OVERMAP_TERRAIN, "overmap_terrain",
-                                     global_omt_to_draw_position( center_abs_omt + rp ), 0,
+                                     global_omt_to_draw_position( center_pos + rp ), 0,
                                      rotation, lit_level::LOW, true );
             }
         }
@@ -986,8 +992,8 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
     // draw nearby seen npcs
     for( const shared_ptr_fast<npc> &guy : npcs_near_player ) {
         const tripoint_abs_omt &guy_loc = guy->global_omt_location();
-        if( guy_loc.z() == center_abs_omt.z() && ( has_debug_vision ||
-                overmap_buffer.seen_more_than( guy_loc, om_vision_level::details ) ) ) {
+        if( guy_loc.z() == center_pos.z() && ( has_debug_vision ||
+                                               overmap_buffer.seen_more_than( guy_loc, om_vision_level::details ) ) ) {
             draw_entity_with_overlays( *guy, global_omt_to_draw_position( guy_loc ), lit_level::LIT,
                                        height_3d );
         }
@@ -995,13 +1001,15 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
 
     draw_entity_with_overlays( get_player_character(), global_omt_to_draw_position( avatar_pos ),
                                lit_level::LIT, height_3d );
-    draw_from_id_string( "cursor", global_omt_to_draw_position( center_abs_omt ), 0, 0, lit_level::LIT,
-                         false );
+    if( !fast_traveling ) {
+        draw_from_id_string( "cursor", global_omt_to_draw_position( center_pos ), 0, 0, lit_level::LIT,
+                             false );
+    }
 
-    if( blink ) {
+    if( draw_overlays ) {
         // Draw path for auto-travel
         for( const tripoint_abs_omt &pos : you.omt_path ) {
-            if( pos.z() == center_abs_omt.z() ) {
+            if( pos.z() == center_pos.z() ) {
                 draw_from_id_string( "highlight", global_omt_to_draw_position( pos ), 0, 0, lit_level::LIT,
                                      false );
             }
@@ -1009,7 +1017,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
 
         if( g->follower_path_to_show ) {
             for( const tripoint_abs_omt &pos : g->follower_path_to_show->omt_path ) {
-                if( pos.z() == center_abs_omt.z() ) {
+                if( pos.z() == center_pos.z() ) {
                     draw_from_id_string( "highlight", global_omt_to_draw_position( pos ), 0, 0, lit_level::LIT,
                                          false );
                 }
@@ -1018,7 +1026,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
 
         // only draw in full tiles so it doesn't get cut off
         const std::optional<std::pair<tripoint_abs_omt, std::string>> mission_arrow =
-                    get_mission_arrow( full_om_tile_area, center_abs_omt );
+                    get_mission_arrow( full_om_tile_area, center_pos );
         if( mission_arrow ) {
             draw_from_id_string( mission_arrow->second, global_omt_to_draw_position( mission_arrow->first ), 0,
                                  0, lit_level::LIT, false );
@@ -1052,7 +1060,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
                            0, 0 ) ).x() / 2;
 
         for( const city_reference &city : overmap_buffer.get_cities_near(
-                 project_to<coords::sm>( center_abs_omt ), radius ) ) {
+                 project_to<coords::sm>( center_pos ), radius ) ) {
             const tripoint_abs_omt city_center = project_to<coords::omt>( city.abs_sm_pos );
             if( overmap_buffer.seen_more_than( city_center, om_vision_level::outlines ) &&
                 overmap_area.contains( city_center.raw() ) ) {
@@ -1061,7 +1069,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
         }
 
         for( const camp_reference &camp : overmap_buffer.get_camps_near(
-                 project_to<coords::sm>( center_abs_omt ), radius ) ) {
+                 project_to<coords::sm>( center_pos ), radius ) ) {
             const tripoint_abs_omt camp_center = project_to<coords::omt>( camp.abs_sm_pos );
             if( overmap_buffer.seen_more_than( camp_center, om_vision_level::outlines ) &&
                 overmap_area.contains( camp_center.raw() ) ) {
@@ -1073,7 +1081,7 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
     std::vector<std::pair<nc_color, std::string>> notes_window_text;
 
     if( uistate.overmap_show_map_notes ) {
-        const std::string &note_text = overmap_buffer.note( center_abs_omt );
+        const std::string &note_text = overmap_buffer.note( center_pos );
         if( !note_text.empty() ) {
             const std::tuple<char, nc_color, size_t> note_info = overmap_ui::get_note_display_info(
                         note_text );
@@ -1081,26 +1089,26 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
             if( pos != std::string::npos ) {
                 notes_window_text.emplace_back( std::get<1>( note_info ), note_text.substr( pos ) );
             }
-            if( overmap_buffer.is_marked_dangerous( center_abs_omt ) ) {
+            if( overmap_buffer.is_marked_dangerous( center_pos ) ) {
                 notes_window_text.emplace_back( c_red, _( "DANGEROUS AREA!" ) );
             }
         }
     }
 
     if( has_debug_vision ||
-        overmap_buffer.seen_more_than( center_abs_omt, om_vision_level::details ) ) {
+        overmap_buffer.seen_more_than( center_pos, om_vision_level::details ) ) {
         for( const auto &npc : npcs_near_player ) {
-            if( !npc->marked_for_death && npc->global_omt_location() == center_abs_omt ) {
+            if( !npc->marked_for_death && npc->global_omt_location() == center_pos ) {
                 notes_window_text.emplace_back( npc->basic_symbol_color(), npc->get_name() );
             }
         }
     }
 
-    for( om_vehicle &v : overmap_buffer.get_vehicle( center_abs_omt ) ) {
+    for( om_vehicle &v : overmap_buffer.get_vehicle( center_pos ) ) {
         notes_window_text.emplace_back( c_white, v.name );
     }
 
-    if( !notes_window_text.empty() ) {
+    if( !notes_window_text.empty() && !fast_traveling ) {
         constexpr int padding = 2;
 
         const auto draw_note_text = [&]( const point & draw_pos, const std::string & name,
@@ -1111,8 +1119,8 @@ void cata_tiles::draw_om( const point &dest, const tripoint_abs_omt &center_abs_
         };
 
         // Find screen coordinates to the right of the center tile
-        auto center_sm = project_to<coords::sm>( tripoint_abs_omt( center_abs_omt.x() + 1,
-                         center_abs_omt.y(), center_abs_omt.z() ) );
+        auto center_sm = project_to<coords::sm>( tripoint_abs_omt( center_pos.x() + 1,
+                         center_pos.y(), center_pos.z() ) );
         const point omt_pos = global_omt_to_draw_position( project_to<coords::omt>( center_sm ) ).xy();
         point draw_point = player_to_screen( omt_pos );
         draw_point += point( padding, padding );
diff --git a/src/uistate.h b/src/uistate.h
index 72d94e29b6339..19c090d277248 100644
--- a/src/uistate.h
+++ b/src/uistate.h
@@ -140,6 +140,8 @@ class uistatedata
         bool overmap_debug_weather = false;
         // draw monster groups on the overmap.
         bool overmap_debug_mongroup = false;
+        bool overmap_fast_travel = false;
+        bool overmap_fast_scroll = false;
 
         // Distraction manager stuff
         bool distraction_noise = true;