Fix #1218 & 1219 Enhance sharing window
Merge pull request #444 from nlegoff/sharing_window

[3.8] Fix #1218 & 1219 Enhance sharing window