diff --git a/changelog.txt b/changelog.txt
index 30e25f696f..08e8ff9f89 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -31,6 +31,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- 'fix/general-strike: make less aggressive about trying to fix problems that don't exist yet
 
 ## Misc Improvements
 
diff --git a/fix/general-strike.lua b/fix/general-strike.lua
index 9807112b22..5081251c2d 100644
--- a/fix/general-strike.lua
+++ b/fix/general-strike.lua
@@ -6,10 +6,15 @@ local argparse = require('argparse')
 local function fix_seeds(quiet)
     local count = 0
     for _,v in ipairs(df.global.world.items.other.SEEDS) do
-        if not v.flags.in_building then
+        if (not v.flags.in_job) and (not v.flags.in_building) then
             local bld = dfhack.items.getHolderBuilding(v)
             if bld and bld:isFarmPlot() then
                 v.flags.in_building = true
+                for _,i in ipairs(bld.contained_items) do
+                    if i.item.id == v.id then
+                        i.use_mode = 2
+                    end
+                end
                 count = count + 1
             end
         end