957049 - Fixing problems due to bubbling

Fixing problems with the solution I came up for in #2336. Namely, hitting enter
repeatedly created duplicates.
Merge pull request #2338 from daviddavis/temp_1369055854

957049 - Fixing problems due to bubbling