diff --git a/modules/cds/favorites/widget.go b/modules/cds/favorites/widget.go
index dff1c4ff..c447549f 100644
--- a/modules/cds/favorites/widget.go
+++ b/modules/cds/favorites/widget.go
@@ -43,7 +43,6 @@ func NewWidget(app *tview.Application, pages *tview.Pages, settings *Settings) *
 	widget.SetDisplayFunction(widget.display)
 
 	widget.Unselect()
-
 	widget.KeyboardWidget.SetView(widget.View)
 
 	widget.client = cdsclient.New(cdsclient.Config{
@@ -136,7 +135,6 @@ func (widget *Widget) currentCDSWorkflow() *sdk.Workflow {
 
 	if widget.Idx < 0 || widget.Idx >= len(widget.workflows) {
 		widget.Idx = 0
-		return nil
 	}
 
 	p := widget.workflows[widget.Idx]
diff --git a/modules/cds/status/display.go b/modules/cds/status/display.go
index b14c5c08..a8862ef4 100644
--- a/modules/cds/status/display.go
+++ b/modules/cds/status/display.go
@@ -27,12 +27,12 @@ func (widget *Widget) content() (string, string, bool) {
 func (widget *Widget) displayStatus() string {
 	status, err := widget.client.MonStatus()
 
-	widget.SetItemCount(len(status.Lines))
-
 	if err != nil || len(status.Lines) == 0 {
 		return fmt.Sprintf(" [red]Error: %v[white]\n", err.Error())
 	}
 
+	widget.SetItemCount(len(status.Lines))
+
 	var (
 		global     []string
 		globalWarn []string