diff --git a/app/assets/javascripts/layout.js b/app/assets/javascripts/layout.js
index b27296d09..ce43fde26 100644
--- a/app/assets/javascripts/layout.js
+++ b/app/assets/javascripts/layout.js
@@ -344,6 +344,16 @@
             $('.dialog-overlay').hide();
         }
 
+        function tabClicked(evt) {
+            evt.preventDefault();
+            var destination = $(evt.currentTarget).attr('tab-target');
+            logger.debug('tabClicked:' + destination);
+            $('[tab-target]').removeClass('selected');
+            $(evt.currentTarget).addClass('selected');
+            $('.tab').hide();
+            $('[tab-id="' + destination + '"]').show();
+        }
+
         function linkClicked(evt) {
             evt.preventDefault();
             var destination = $(evt.currentTarget).attr('layout-link');
@@ -438,6 +448,7 @@
             $('[layout-action="close"]').on('click', close);
             $('[layout-sidebar-expander]').on('click', toggleSidebar);
             $('[layout-panel="expanded"] [layout-panel="header"]').on('click', panelHeaderClicked);
+            $('[tab-target]').on('click', tabClicked);
         }
 
         // public functions
diff --git a/app/views/clients/_session.html.erb b/app/views/clients/_session.html.erb
index e3b677c53..348b2abf9 100644
--- a/app/views/clients/_session.html.erb
+++ b/app/views/clients/_session.html.erb
@@ -146,9 +146,9 @@
 
     <div class="dialog-inner">
         <div class="dialog-tabs">
-            <a>Audio Inputs</a> 
-            <a>Audio Outputs</a> 
-            <a class="selected">Voice Chat</a>    
+            <a tab-target="audio-inputs">Audio Inputs</a> 
+            <a tab-target="audio-outputs">Audio Outputs</a> 
+            <a tab-target="voice-chat" class="selected">Voice Chat</a>    
         </div>
         Use arrow buttons to assign audio inputs to your tracks, and choose what
         instrument you are playing on each track. Please note that you may only
@@ -233,7 +233,7 @@
         </div> <!-- End Panel for Audio Inputs Tab -->
 
         <!-- Panel for Audio Outputs -->
-        <div class="tab" tab-id="audio-inputs" style="display:none;">
+        <div class="tab" tab-id="audio-outputs" style="display:none;">
             <div class="left w50">
                 Unused Outputs:<br />
                 <select class="w100" multiple="multiple" size="8">
@@ -253,14 +253,14 @@
                 </div>
                 Session Audio Output:<br />
 
-                <select class="w90" multiple="multiple" size="8"><option>USB Audio Codec 1</option><option>USB Audio Codec 2</option></select>
+                <select class="w80" multiple="multiple" size="8"><option>USB Audio Codec 1</option><option>USB Audio Codec 2</option></select>
 
             </div>
         </div>
         <!-- End Panel for Audio Outputs -->
 
         <!-- Panel for Voice Chat -->
-        <div class="tab" tab-id="audio-inputs">
+        <div class="tab" tab-id="voice-chat">
             <div class="left w50">
                 Unused Inputs:<br />
                 <select class="w100" multiple="multiple" size="8">