Fix for Add Button ui closing adruptly