                         clear_modals()
                         return
                     output = {}
-                    output[@secondary.shard] = _.map pinned_machines, (m)->m.value
+                    output[@secondary.shard] = _.union (_.map pinned_machines, (m)->m.value), @get_currently_pinned()
                     output =
                         secondary_pinnings: output
                     $.ajax

            @change_hints_state = false
            super @template

        disable_used_options: ->
            # Make sure the same machine cannot be selected
            # twice. Also disable the machine used for the master.


            # Bind events to 'assign machine' links
            for shard in shards_array
                @bind_edit_machines(shard)

            return @

