Minor Fix for non-drag/drop