diff --git a/extension.json b/extension.json
index 0c10ac42..87ab12c5 100644
--- a/extension.json
+++ b/extension.json
@@ -260,7 +260,6 @@
 				"jquery.cookie",
 				"jquery.throttle-debounce",
 				"jquery.suggestions",
-				"jquery.tabIndex",
 				"jquery.textSelection",
 				"jquery.ui.button",
 				"jquery.ui.dialog",
diff --git a/modules/jquery.wikiEditor.dialogs.js b/modules/jquery.wikiEditor.dialogs.js
index b77f112a..c869d981 100644
--- a/modules/jquery.wikiEditor.dialogs.js
+++ b/modules/jquery.wikiEditor.dialogs.js
@@ -122,9 +122,6 @@
 					.appendTo( $( 'body' ) )
 					.each( module.init )
 					.dialog( configuration );
-				// Set tabindexes on buttons added by .dialog()
-				dialogsModule.fn.setTabindexes( $dialogDiv.closest( '.ui-dialog' )
-					.find( 'button' ).not( '[tabindex]' ) );
 				if ( !( 'resizeme' in module ) || module.resizeme ) {
 					$dialogDiv
 						.on( 'dialogopen', dialogsModule.fn.resize )
@@ -180,19 +177,6 @@
 				$oldHidden.each( function () {
 					$( this ).attr( 'style', $( this ).data( 'oldstyle' ) );
 				} );
-			},
-
-			/**
-			 * Set the right tabindexes on elements in a dialog
-			 *
-			 * @param {Object} $elements Elements to set tabindexes on. If they already have tabindexes, this function can behave a bit weird
-			 */
-			setTabindexes: function ( $elements ) {
-				// Get the highest tab index
-				var tabIndex = $( document ).lastTabIndex() + 1;
-				$elements.each( function () {
-					$( this ).attr( 'tabindex', tabIndex++ );
-				} );
 			}
 		},