PR: #2412 - Fix workspace header and search
Resolves: #2172
Author: @lissy93
Commit: 2b8ef286c386e6dc020b94cbfc6bec0075be9044