diff --git a/common/firefox.nix b/common/firefox.nix
index 136d280..cfa0536 100644
--- a/common/firefox.nix
+++ b/common/firefox.nix
@@ -59,7 +59,6 @@ in
           );
         DisableTelemetry = true;
         DisableFirefoxStudies = true;
-        DisableScreenshots = true;
         EnableTrackingProtection = {
           Value = true;
           Locked = true;
diff --git a/overlays/firefox-search.nix b/overlays/firefox-search.nix
index 43e4efb..b15d1da 100644
--- a/overlays/firefox-search.nix
+++ b/overlays/firefox-search.nix
@@ -1,25 +1,17 @@
 { prev, final, ... }:
 {
-#  firefox-unwrapped = (prev.firefox-unwrapped.overrideAttrs (old: {
-#    patches = (old.patches or []) ++ [ ../patches/firefox_search_engines.patch ];
-#  })).override {
-#    stdenv = prev.ccacheStdenv;
-#    overrideCC = stdenv: compiler: let
-#      env = prev.ccacheStdenv.override { inherit stdenv; };
-#    in prev.overrideCC env compiler;
-#  };
   firefox = prev.firefox.overrideAttrs (old: {
     nativeBuildInputs = (old.nativeBuildInputs or []) ++ (with prev; [ zip unzip gnused ] );
     buildCommand = ''
       export buildRoot="$(pwd)"
     '' + old.buildCommand + ''
-      cd $buildRoot
+      pushd $buildRoot
       unzip $out/lib/firefox/browser/omni.ja -d patched_omni || true
       rm $out/lib/firefox/browser/omni.ja
       cd patched_omni
       sed -i 's/"enterprise_only"\s*:\s*true,//' modules/policies/schema.sys.mjs
       zip -0DXqr $out/lib/firefox/browser/omni.ja * # potentially qr9XD
-      cd $out
+      popd
     '';
   });
 }