diff --git a/src/QBar/Core.hs b/src/QBar/Core.hs
index 74cb0cfc6f5ada5c06e0d80b524a2784f27a940f..c87a6976d2c46fd95832a0ecb26b6da6681663ba 100644
--- a/src/QBar/Core.hs
+++ b/src/QBar/Core.hs
@@ -150,8 +150,7 @@ hasEventHandler (Just (_, Just _)) = True
 hasEventHandler _ = False
 
 invalidateBlockState :: BlockState -> BlockState
-invalidateBlockState Nothing = Nothing
-invalidateBlockState (Just (output, eventHandler)) = Just (invalidateBlock output, eventHandler)
+invalidateBlockState = (_Just . _1) %~ invalidateBlock
 
 
 runBarIO :: MonadIO m => Bar -> BarIO r -> m r