diff --git a/components/profile/heartbeats.rs b/components/profile/heartbeats.rs
index b05cbf74b71..4661dad6183 100644
--- a/components/profile/heartbeats.rs
+++ b/components/profile/heartbeats.rs
@@ -2,95 +2,55 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-
 use heartbeats_simple::HeartbeatPow as Heartbeat;
-use heartbeats_simple::HeartbeatPowContext as HeartbeatContext;
 use profile_traits::time::ProfilerCategory;
+use self::synchronized_heartbeat::{heartbeat_window_callback, lock_and_work};
 use servo_config::opts;
 use std::collections::HashMap;
 use std::env::var_os;
 use std::error::Error;
 use std::fs::File;
-use std::mem;
 use std::path::Path;
 
-
-static mut HBS: Option<*mut HashMap<ProfilerCategory, Heartbeat>> = None;
-
 /// Initialize heartbeats
 pub fn init() {
-    let mut hbs: HashMap<ProfilerCategory, Heartbeat> = HashMap::new();
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::Compositing);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutPerform);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutStyleRecalc);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutTextShaping);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutRestyleDamagePropagation);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutNonIncrementalReset);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutSelectorMatch);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutTreeBuilder);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutDamagePropagate);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutGeneratedContent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutDisplayListSorting);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutFloatPlacementSpeculation);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutMain);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutStoreOverflow);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutParallelWarmup);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::LayoutDispListBuild);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::NetHTTPRequestResponse);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::PaintingPerTile);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::PaintingPrepBuff);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::Painting);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ImageDecoding);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ImageSaving);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptAttachLayout);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptConstellationMsg);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptDevtoolsMsg);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptDocumentEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptDomEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptEvaluate);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptFileRead);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptImageCacheMsg);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptInputEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptNetworkEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptParseHTML);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptPlannedNavigation);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptResize);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptSetScrollState);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptSetViewport);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptTimerEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptStylesheetLoad);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptUpdateReplacedElement);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptWebSocketEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptWorkerEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptServiceWorkerEvent);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ScriptParseXML);
-    maybe_create_heartbeat(&mut hbs, ProfilerCategory::ApplicationHeartbeat);
-    unsafe {
-        HBS = Some(mem::transmute(Box::new(hbs)));
-    }
+    lock_and_work(|hbs_opt|
+        if hbs_opt.is_none() {
+            let mut hbs: Box<HashMap<ProfilerCategory, Heartbeat>> = Box::new(HashMap::new());
+            maybe_create_heartbeat(&mut hbs, ProfilerCategory::ApplicationHeartbeat);
+            *hbs_opt = Some(Box::into_raw(hbs))
+        }
+    );
 }
 
 /// Log regmaining buffer data and cleanup heartbeats
 pub fn cleanup() {
-    unsafe {
-        if let Some(hbs) = HBS {
-            let mut h: Box<HashMap<ProfilerCategory, Heartbeat>> = mem::transmute(hbs);
-            for (_, mut v) in h.iter_mut() {
-                // log any remaining heartbeat records before dropping
-                log_heartbeat_records(v);
+    let hbs_opt_box: Option<Box<HashMap<ProfilerCategory, Heartbeat>>> = lock_and_work(|hbs_opt|
+        hbs_opt.take().map(|hbs_ptr|
+            unsafe {
+                Box::from_raw(hbs_ptr)
             }
-            h.clear();
+        )
+    );
+    if let Some(mut hbs) = hbs_opt_box {
+        for (_, mut v) in hbs.iter_mut() {
+            // log any remaining heartbeat records before dropping
+            log_heartbeat_records(v);
         }
-        HBS = None;
+        hbs.clear();
     }
 }
 
 /// Check if a heartbeat exists for the given category
 pub fn is_heartbeat_enabled(category: &ProfilerCategory) -> bool {
-    unsafe {
-        HBS.map_or(false, |m| (*m).contains_key(category))
-    }
+    let is_enabled = lock_and_work(|hbs_opt|
+        hbs_opt.map_or(false, |hbs_ptr|
+            unsafe {
+                (*hbs_ptr).contains_key(category)
+            }
+        )
+    );
+    is_enabled || is_create_heartbeat(category)
 }
 
 /// Issue a heartbeat (if one exists) for the given category
@@ -99,13 +59,18 @@ pub fn maybe_heartbeat(category: &ProfilerCategory,
                        end_time: u64,
                        start_energy: u64,
                        end_energy: u64) {
-    unsafe {
-        if let Some(map) = HBS {
-            if let Some(mut h) = (*map).get_mut(category) {
-                (*h).heartbeat(0, 1, start_time, end_time, start_energy, end_energy);
+    lock_and_work(|hbs_opt|
+        if let Some(hbs_ptr) = *hbs_opt {
+            unsafe {
+                if !(*hbs_ptr).contains_key(category) {
+                    maybe_create_heartbeat(&mut (*hbs_ptr), category.clone());
+                }
+                if let Some(mut h) = (*hbs_ptr).get_mut(category) {
+                    (*h).heartbeat(0, 1, start_time, end_time, start_energy, end_energy);
+                }
             }
         }
-    }
+    );
 }
 
 // TODO(cimes): Android doesn't really do environment variables. Need a better way to configure dynamically.
@@ -172,14 +137,39 @@ fn log_heartbeat_records(hb: &mut Heartbeat) {
     }
 }
 
-/// Callback function used to log the window buffer.
-/// When this is called from native C, the heartbeat is safely locked
-extern fn heartbeat_window_callback(hb: *const HeartbeatContext) {
-    unsafe {
-        if let Some(map) = HBS {
-            for (_, v) in (*map).iter_mut() {
-                if &v.hb as *const HeartbeatContext == hb {
-                    log_heartbeat_records(v);
+mod synchronized_heartbeat {
+    use heartbeats_simple::HeartbeatPow as Heartbeat;
+    use heartbeats_simple::HeartbeatPowContext as HeartbeatContext;
+    use profile_traits::time::ProfilerCategory;
+    use std::collections::HashMap;
+    use std::sync::atomic::{ATOMIC_BOOL_INIT, AtomicBool, Ordering};
+    use super::log_heartbeat_records;
+
+    static mut HBS: Option<*mut HashMap<ProfilerCategory, Heartbeat>> = None;
+
+    // unfortunately can't encompass the actual hashmap in a Mutex (Heartbeat isn't Send/Sync), so we'll use a spinlock
+    static HBS_SPINLOCK: AtomicBool = ATOMIC_BOOL_INIT;
+
+    pub fn lock_and_work<F, R>(work: F) -> R
+        where F: FnOnce(&mut Option<*mut HashMap<ProfilerCategory, Heartbeat>>) -> R {
+        while HBS_SPINLOCK.compare_and_swap(false, true, Ordering::SeqCst) {}
+        let result = unsafe {
+            work(&mut HBS)
+        };
+        HBS_SPINLOCK.store(false, Ordering::SeqCst);
+        result
+    }
+
+    /// Callback function used to log the window buffer.
+    /// When this is called from native C, the heartbeat is safely locked internally and the global lock is held.
+    /// If calling from this file, you must already hold the global lock!
+    pub extern fn heartbeat_window_callback(hb: *const HeartbeatContext) {
+        unsafe {
+            if let Some(hbs_ptr) = HBS {
+                for (_, v) in (*hbs_ptr).iter_mut() {
+                    if &v.hb as *const HeartbeatContext == hb {
+                        log_heartbeat_records(v);
+                    }
                 }
             }
         }
diff --git a/tests/heartbeats/characterize.py b/tests/heartbeats/characterize.py
index 948f5b9de43..9674119c44b 100644
--- a/tests/heartbeats/characterize.py
+++ b/tests/heartbeats/characterize.py
@@ -65,6 +65,9 @@ HEARTBEAT_PROFILER_CATEGORIES = [
     ("ScriptWorkerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptServiceWorkerEvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ScriptParseXML", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptEnterFullscreen", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptExitFullscreen", HEARTBEAT_DEFAULT_WINDOW_SIZE),
+    ("ScriptWebVREvent", HEARTBEAT_DEFAULT_WINDOW_SIZE),
     ("ApplicationHeartbeat", 100),
 ]
 ENERGY_READER_BIN = "energymon-file-provider"