Added better support for showing the table view

In some situations (like state restoration) they table view may not be shown.