Fix fab button behavior
Merge branch 'sssemil-patch-2'