         if not @props.open_files_order?
             return <Loading />
         group = @props.get_my_group(@props.project_id)
-        path = misc.tab_to_path(@props.active_project_tab)
+        active_path = misc.tab_to_path(@props.active_project_tab)
 
         <div className='container-content' style={display: 'flex', flexDirection: 'column', flex: 1}>
             <FreeProjectWarning project_id={@props.project_id} name={name} />
             {@render_file_tabs(group == 'public') if not @props.fullscreen}
-            <ProjectMainContent
+            <ProjectContentViewer
                 project_id      = {@props.project_id}
                 project_name    = {@props.name}
                 active_tab_name = {@props.active_project_tab}
+                opened_file     = {@props.open_files.getIn([active_path])}
+                file_path       = {active_path}
                 group           = {group}
-                open_files      = {@props.open_files}
-                save_scroll     = {@actions(name).get_scroll_saver_for(path)}
+                save_scroll     = {@actions(name).get_scroll_saver_for(active_path)}
             />
         </div>
 

        is_public : false

# Children must define their own padding from navbar and screen borders
ProjectMainContent = rclass
    propTypes :
        project_id      : rtypes.string.isRequired
        project_name    : rtypes.string.isRequired
        open_files      : rtypes.object
        active_tab_name : rtypes.string
        group           : rtypes.string
        save_scroll     : rtypes.func


                    {@render_one_file_item() if @props.open_files_order.size == 1}
                </Nav>
            </div> if not @props.fullscreen}
            <ProjectContentViewer
                project_id      = {@props.project_id}
                project_name    = {@props.name}
                active_tab_name = {@props.active_project_tab}
                opened_file     = {@props.open_files.getIn([active_path])}
                file_path       = {active_path}
                group           = {group}
                save_scroll     = {@actions(name).get_scroll_saver_for(active_path)}
            />
        </div>
