diff --git a/docshell/base/CanonicalBrowsingContext.h b/docshell/base/CanonicalBrowsingContext.h
index aa3985c79880..9287fdcdd101 100644
--- a/docshell/base/CanonicalBrowsingContext.h
+++ b/docshell/base/CanonicalBrowsingContext.h
@@ -287,7 +287,8 @@ class CanonicalBrowsingContext final : public BrowsingContext {
 
   void SetRestoreData(SessionStoreRestoreData* aData, ErrorResult& aError);
   void ClearRestoreState();
-  void RequestRestoreTabContent(WindowGlobalParent* aWindow);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY void RequestRestoreTabContent(
+      WindowGlobalParent* aWindow);
   already_AddRefed<Promise> GetRestorePromise();
 
   nsresult WriteSessionStorageToSessionStore(
diff --git a/dom/ipc/WindowGlobalChild.h b/dom/ipc/WindowGlobalChild.h
index 32712b111153..353aad6533ca 100644
--- a/dom/ipc/WindowGlobalChild.h
+++ b/dom/ipc/WindowGlobalChild.h
@@ -187,7 +187,8 @@ class WindowGlobalChild final : public WindowGlobalActor,
       const dom::sessionstore::DocShellRestoreState& aState,
       RestoreDocShellStateResolver&& aResolve);
 
-  mozilla::ipc::IPCResult RecvRestoreTabContent(
+  // TODO: Use MOZ_CAN_RUN_SCRIPT when it gains IPDL support (bug 1539864)
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY mozilla::ipc::IPCResult RecvRestoreTabContent(
       dom::SessionStoreRestoreData* aData,
       RestoreTabContentResolver&& aResolve);
 
diff --git a/toolkit/components/sessionstore/SessionStoreRestoreData.cpp b/toolkit/components/sessionstore/SessionStoreRestoreData.cpp
index 79e95dcba46d..37fc151eefcb 100644
--- a/toolkit/components/sessionstore/SessionStoreRestoreData.cpp
+++ b/toolkit/components/sessionstore/SessionStoreRestoreData.cpp
@@ -52,7 +52,6 @@ bool SessionStoreRestoreData::CanRestoreInto(nsIURI* aDocumentURI) {
           equalsExceptRef);
 }
 
-MOZ_CAN_RUN_SCRIPT
 bool SessionStoreRestoreData::RestoreInto(RefPtr<BrowsingContext> aContext) {
   if (!aContext->IsInProcess()) {
     return false;
diff --git a/toolkit/components/sessionstore/SessionStoreRestoreData.h b/toolkit/components/sessionstore/SessionStoreRestoreData.h
index 02d3a904ba03..773227bda161 100644
--- a/toolkit/components/sessionstore/SessionStoreRestoreData.h
+++ b/toolkit/components/sessionstore/SessionStoreRestoreData.h
@@ -28,7 +28,7 @@ class SessionStoreRestoreData final : public nsISessionStoreRestoreData {
   bool IsEmpty();
   SessionStoreRestoreData* FindDataForChild(BrowsingContext* aContext);
   bool CanRestoreInto(nsIURI* aDocumentURI);
-  bool RestoreInto(RefPtr<BrowsingContext> aContext);
+  MOZ_CAN_RUN_SCRIPT bool RestoreInto(RefPtr<BrowsingContext> aContext);
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISESSIONSTORERESTOREDATA