diff --git a/resources/src/mediawiki.special.apisandbox/apisandbox.js b/resources/src/mediawiki.special.apisandbox/apisandbox.js
index 2dcd5dbf56c..748af02f9a7 100644
--- a/resources/src/mediawiki.special.apisandbox/apisandbox.js
+++ b/resources/src/mediawiki.special.apisandbox/apisandbox.js
@@ -1654,7 +1654,7 @@
 				);
 				button.on( 'click', removeDynamicParamWidget, [ name, layout ] );
 				that.widgets[ name ] = widget;
-				dynamicFieldset.addItems( [ layout ], dynamicFieldset.getItems().length - 1 );
+				dynamicFieldset.addItems( [ layout ], dynamicFieldset.getItemCount() - 1 );
 				widget.focus();
 
 				dynamicParamNameWidget.setValue( '' );
diff --git a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
index 7be881cfe55..611eae1e2da 100644
--- a/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
+++ b/resources/src/mediawiki.widgets/MediaSearch/mw.widgets.MediaSearchWidget.js
@@ -118,7 +118,7 @@
 			this.resetRows();
 			this.itemCache = {};
 			this.processQueueResults( items );
-			if ( this.results.getItems().length > 0 ) {
+			if ( !this.results.isEmpty() ) {
 				this.lazyLoadResults();
 			}
 
@@ -181,8 +181,8 @@
 				}
 
 				search.query.popPending();
-				search.noItemsMessage.toggle( search.results.getItems().length === 0 );
-				if ( search.results.getItems().length > 0 ) {
+				search.noItemsMessage.toggle( search.results.isEmpty() );
+				if ( !search.results.isEmpty() ) {
 					search.lazyLoadResults();
 				}