China had a similar shortage (actually more severe due to their population size) but they got on with the program and furiously ramped up their production. We need to do the same here. Remember the whole world will be looking to buy masks and we have no reason to believe that we will be in the front of the line.
Right now there's a huge shortage and we still have a very small number of cases--it's all people stockpiling and using them where it's not as critical.
Like you say, after we can replenish the supply I'm sure it will be more commonplace.