diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
index 29e273e43506..66b0c1e37a16 100755
--- a/gfx/skia/generate_mozbuild.py
+++ b/gfx/skia/generate_mozbuild.py
@@ -67,6 +67,8 @@ LOCAL_INCLUDES += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     if CONFIG['CC_TYPE'] == 'gcc':
         DEFINES['SK_JUMPER_USE_ASSEMBLY'] = False
+    elif CONFIG['CPU_ARCH'] == 'x86':
+        SOURCES['skia/src/jumper/SkJumper_generated_win.S'].flags += ['-safeseh']
     DEFINES['UNICODE'] = True
     DEFINES['_UNICODE'] = True
     UNIFIED_SOURCES += [
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
index 2ec2852a968a..cff6930a9605 100755
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -712,6 +712,8 @@ LOCAL_INCLUDES += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     if CONFIG['CC_TYPE'] == 'gcc':
         DEFINES['SK_JUMPER_USE_ASSEMBLY'] = False
+    elif CONFIG['CPU_ARCH'] == 'x86':
+        SOURCES['skia/src/jumper/SkJumper_generated_win.S'].flags += ['-safeseh']
     DEFINES['UNICODE'] = True
     DEFINES['_UNICODE'] = True
     UNIFIED_SOURCES += [