Tabs Not Displaying on screen when user has custom field configuration

Summary

Regardless of fields selected under configure fields, when using a custom layout tabs are not displayed, per the screens configuration.

Steps to Reproduce

1. Add a tab to a screen in the Configure Screen
2. On the screen select Configure Fields
3. For Show Fields Choose custom
4. Select Fields displayed Under Both Tab Options in Dropdown

Expected Results

The Tabs will be displayed if a field under the tab is chosen.

Actual Results

No Tabs are displayed and all selected fields are displayed on the default modal popup screen view

Workaround

Switch Show Fields to all to display the configured tabs.