Comment link leads to a default (unthemed) display of a node?

After creating a variant in my node template panel (user_view) i added node_links in a pane.
This created a 'add comment link'.

After some testing i noticed that by clicking the 'add comment link' i am taken to a comment form wich also displays the default (unthemed) version of the node. As i have been theming this node by adding a variant in the node template in the first place, theming the node agian on the comment form would give me quit some extra work.

Is there a easier way to get my 'themed' version of the node displayed on the comment form?

Thanks