diff --git a/app/assets/javascripts/lib/jquery.trap.js b/app/assets/javascripts/lib/jquery.trap.js
index 88486cbabea..78a2c043927 100644
--- a/app/assets/javascripts/lib/jquery.trap.js
+++ b/app/assets/javascripts/lib/jquery.trap.js
@@ -65,15 +65,17 @@ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED.
             }
 
             curElt = $focussable.get(nextIndex);
-            // IE sometimes throws when an element is not visible
+            if (!curElt || curElt === elt) { return true; }
+
             try {
                 curElt.focus();
-            } catch(e) {
+            } catch(e) { // IE sometimes throws when an element is not visible
+                return true;
             }
-        
-        } while (elt === elt.ownerDocument.activeElement);
 
-        return true;        
+        } while ($focussable.length > 1 && elt === elt.ownerDocument.activeElement);
+
+        return true;
     }
 
     function filterKeepSpeciallyFocusable() {
diff --git a/public/templates/work_packages/column_context_menu.html b/public/templates/work_packages/column_context_menu.html
index 60227c2529c..a67a6dbf735 100644
--- a/public/templates/work_packages/column_context_menu.html
+++ b/public/templates/work_packages/column_context_menu.html
@@ -2,55 +2,51 @@
      class="action-menu dropdown-relative"
      ng-class="{'dropdown-anchor-right': column && column.name !== 'id'}">
   <ul class="menu">
-    <li ng-if="canSort()" ng-click="sortAscending(column.name)">
-      <a focus href>
+    <li ng-if="canSort()">
+      <a focus href="" ng-click="sortAscending(column.name)">
         <i class="icon-action-menu icon-sort-ascending"></i>
         <span ng-bind="I18n.t('js.work_packages.query.sort_ascending')"/>
       </a>
     </li>
 
-    <li ng-if="canSort()" ng-click="sortDescending(column.name)">
+    <li ng-if="canSort()">
       <i class="icon-action-menu icon-sort-descending"></i>
-      <a href>
+      <a href="" ng-click="sortDescending(column.name)">
         <span ng-bind="I18n.t('js.work_packages.query.sort_descending')"/>
       </a>
     </li>
 
-    <li ng-click="groupBy(column.name)"
-        ng-if="isGroupable">
+    <li ng-if="isGroupable">
       <i class="icon-action-menu icon-group-by2"></i>
-      <a focus="focusFeature('group')" href>
+      <a focus="focusFeature('group')" href="" ng-click="groupBy(column.name)">
         <span ng-bind="I18n.t('js.work_packages.query.group')"/>
       </a>
     </li>
 
-    <li ng-click="moveLeft(column.name)"
-        ng-if="canMoveLeft()">
+    <li ng-if="canMoveLeft()">
       <i class="icon-action-menu icon-column-left"></i>
-      <a focus="focusFeature('moveLeft')" href>
+      <a focus="focusFeature('moveLeft')" href="" ng-click="moveLeft(column.name)">
         <span ng-bind="I18n.t('js.work_packages.query.move_column_left')"/>
       </a>
     </li>
 
-    <li ng-click="moveRight(column.name)"
-        ng-if="canMoveRight()">
+    <li ng-if="canMoveRight()">
       <i class="icon-action-menu icon-column-right"></i>
-      <a focus="focusFeature('moveRight')" href>
+      <a focus="focusFeature('moveRight')" href="" ng-click="moveRight(column.name)">
         <span ng-bind="I18n.t('js.work_packages.query.move_column_right')"/>
       </a>
     </li>
 
-    <li ng-if="canBeHidden()"
-        ng-click="hideColumn(column.name)">
+    <li ng-if="canBeHidden()" >
     <i class="icon-action-menu icon-delete2"></i>
-      <a focus="focusFeature('hide')" href>
+      <a focus="focusFeature('hide')" href="" ng-click="hideColumn(column.name)">
         <span ng-bind="I18n.t('js.work_packages.query.hide_column')"/>
       </a>
     </li>
 
-    <li ng-click="insertColumns()">
+    <li>
     <i class="icon-action-menu icon-columns"></i>
-      <a focus="focusFeature('insert')" href>
+      <a focus="focusFeature('insert')" href="" ng-click="insertColumns()">
         <span ng-bind="I18n.t('js.work_packages.query.insert_columns')"/>
       </a>
     </li>
diff --git a/public/templates/work_packages/work_package_context_menu.html b/public/templates/work_packages/work_package_context_menu.html
index bfc04bd0362..b2cda4e1ead 100644
--- a/public/templates/work_packages/work_package_context_menu.html
+++ b/public/templates/work_packages/work_package_context_menu.html
@@ -1,7 +1,7 @@
 <div id="work-package-context-menu" class="action-menu">
   <ul class="menu">
     <li class="open" feature-flag="detailsView">
-      <a focus="isDetailsViewLinkVisible()" href
+      <a focus="isDetailsViewLinkVisible()" href=""
          ui-sref="work-packages.list.details.overview({workPackageId: row.object.id})">
         <i ng-class="['icon-action-menu', 'icon-table-detail-view']"></i>
         <span ng-bind="I18n.t('js.button_open_details')"/>
@@ -10,22 +10,22 @@
     <li ng-repeat="(action, link) in permittedActions"
         ng-click="triggerContextMenuAction(action, link)"
         class="{{action}}">
-      <a focus="$index == 0 && !isDetailsViewLinkVisible()" href ng-click="deleteWorkPackages()">
+      <a focus="$index == 0 && !isDetailsViewLinkVisible()" href="" ng-click="deleteWorkPackages()">
         <i ng-class="['icon-action-menu', 'icon-' + action]"></i>
         <span ng-bind="I18n.t('js.button_' + action)"/>
       </a>
     </li>
 
     <li class="folder priority" ng-hide="hideResourceActions">
-      <a href class="context_item">TODO Priority</a>
+      <a href="" class="context_item">TODO Priority</a>
       <i class="icon-pulldown-arrow4 icon-submenu"></i>
       <ul class="sub-menu">
-        <li><a href class=" disabled">Immediate</a></li>
-        <li><a href class=" disabled">Urgent</a></li>
-        <li><a href class=" disabled">High</a></li>
-        <li><a href class=" disabled">Normal</a></li>
-        <li><a href class=" disabled">Low</a></li>
-        <li><a href class=" disabled">Pointless</a></li>
+        <li><a href="" class=" disabled">Immediate</a></li>
+        <li><a href="" class=" disabled">Urgent</a></li>
+        <li><a href="" class=" disabled">High</a></li>
+        <li><a href="" class=" disabled">Normal</a></li>
+        <li><a href="" class=" disabled">Low</a></li>
+        <li><a href="" class=" disabled">Pointless</a></li>
       </ul>
       <div class="submenu"></div>
     </li>