The stability and homogeneity of a protein sample is strongly influenced by the composition of the buffer that the protein is in. A quick and easy approach to identify a buffer composition which increases the stability and possibly the conformational homogeneity of a protein sample is the fluorescence-based thermal-shift assay (Thermofluor). Here, a novel 96-condition screen for Thermofluor experiments is presented which consists of buffer and additive parts. The buffer screen comprises 23 different buffers and the additive screen includes small-molecule additives such as salts and nucleotide analogues. The utilization of small-molecule components which increase the thermal stability of a protein sample frequently results in a protein preparation of higher quality and quantity and ultimately also increases the chances of the protein crystallizing.