 		# Show them
 		$.when( imagesLoaded.getState() ).done =>
 
-			if spinnerTimerId isnt null then @hideSpinner()
-
-			# Show only the new ones
-			# with "greater than" what we currently have
-			@showItems @$context.find(SELETOR_CELL_ITEM + ':gt(' + currentNumberOfCols + ')')
+			if spinnerTimerId isnt null
+				clearTimeout spinnerTimerId
+				@spinner.hide(=>
+					@showItems @$context.find(SELETOR_CELL_ITEM + ':gt(' + currentNumberOfCols + ')')
+				)
+			else
+				# Show only the new ones
+				# with "greater than" what we currently have
+				@showItems @$context.find(SELETOR_CELL_ITEM + ':gt(' + currentNumberOfCols + ')')
+
 
 	###
 		Goes through the images and call RIO to

		@showGrid()
		hasChangedBreakpoint = false

	showSpinner: () =>
		@spinner.show()

	hideSpinner: () =>
		@spinner.hide()

	isUsingRIO: () ->
		typeof ResponsiveIO is 'object'


	###
	showGrid: () =>
		return if currentBreakpointKey is null
		spinnerTimerId = setTimeout @spinner.show, SPINNER_TIMEOUT_MS
		$.when( imagesLoaded.getState() ).done =>
			if spinnerTimerId isnt null
				clearTimeout spinnerTimerId
				@spinner.hide(=>
					@$context.addClass CLASS_READY
					@showItems( @$context.find( SELETOR_CELL_APPENDED_ITEM ) )
				)
			else
				@$context.addClass CLASS_READY
				@showItems( @$context.find( SELETOR_CELL_APPENDED_ITEM ) )

	###
		Resets the model to it's initial state
