diff --git a/src/webapp/framework/core/js/jquery.keyboard-a11y.js b/src/webapp/framework/core/js/jquery.keyboard-a11y.js index 139b9da9fa..acd7a32832 100644 --- a/src/webapp/framework/core/js/jquery.keyboard-a11y.js +++ b/src/webapp/framework/core/js/jquery.keyboard-a11y.js @@ -369,7 +369,11 @@ var fluid = fluid || fluid_1_2; var prepareShift = function(selectionContext) { // FLUID-3590: FF 3.6 and Safari 4.x won't fire blur() when programmatically moving focus. - selectionContext.selectedElement().blur(); + var selElm = selectionContext.selectedElement(); + if (selElm) { + selElm.blur(); + } + unselectElement(selectionContext.selectedElement(), selectionContext); if (selectionContext.activeItemIndex === NO_SELECTION) { selectionContext.activeItemIndex = -1;