diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
index 98609399712d924fe8fab72c3d194d78ddceac18..1a70cb241d71302fca626f5f9c32f90f6cf5182b 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/SampleFormController.js
@@ -401,11 +401,11 @@ function SampleFormController(mainController, mode, sample) {
 				var searchUntilFound = null;
 				    searchUntilFound = function() {
 					mainController.serverFacade.searchWithIdentifiers([sampleIdentifierToOpen], function(data) {
-						if(data && data.length === 1) {
+						if(data && data.length > 0) {
 							mainController.changeView('showViewSamplePageFromPermId',data[0].permId);
 							Util.unblockUI();
-						} else { //Recursive call
-							searchUntilFound();
+						} else { // Recursive call, only if not found yet due to reindexing
+							setTimeout(searchUntilFound, 100);
 						}
 					});
 				}